fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-12 14:40:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ifcfg-rh: ensure BRIDGE and VLAN connections get completely ignored

Browse source 
Unlike NM_CONTROLLED=no connections we don't even want to both with
these when their devices aren't supposed to be managed.
This commit is contained in:
Dan Williams 2010-08-04 16:55:07 -05:00
parent 250aaa2deb
commit 18fdf0c0a9
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
system-settings/plugins/ifcfg-rh/reader.c
View file

@ -3203,6 +3203,7 @@ connection_from_file (const char *filename,
gboolean nm_controlled = TRUE;
gboolean ip6_used = FALSE;
GError *error = NULL;
gboolean ignore_connection = FALSE;
g_return_val_if_fail (filename != NULL, NULL);
g_return_val_if_fail (unmanaged != NULL, NULL);
@ -3292,6 +3293,7 @@ connection_from_file (const char *filename,
if (tmp) {
g_free (tmp);
nm_controlled = FALSE;
ignore_connection = TRUE;
}
if (nm_controlled) {
@ -3299,6 +3301,7 @@ connection_from_file (const char *filename,
if (tmp) {
g_free (tmp);
nm_controlled = FALSE;
ignore_connection = TRUE;
}
}
@ -3323,8 +3326,13 @@ connection_from_file (const char *filename,
g_free (type);
/* Don't bother reading the connection fully if it's unmanaged */
if (!connection || *unmanaged)
if (!connection || *unmanaged || ignore_connection) {
if (connection && ignore_connection) {
g_object_unref (connection);
connection = NULL;
}
goto done;
}
s_ip6 = make_ip6_setting (parsed, network_file, iscsiadm_path, &error);
if (error) {