diff --git a/system-settings/plugins/ifcfg-rh/plugin.c b/system-settings/plugins/ifcfg-rh/plugin.c index 47ce0075f8..8a831228c2 100644 --- a/system-settings/plugins/ifcfg-rh/plugin.c +++ b/system-settings/plugins/ifcfg-rh/plugin.c @@ -146,7 +146,7 @@ read_one_connection (SCPluginIfcfg *plugin, const char *filename) if (nm_ifcfg_connection_get_unmanaged_spec (connection)) { PLUGIN_PRINT (IFCFG_PLUGIN_NAME, "Ignoring connection '%s' and its " - "device because NM_CONTROLLED was false.", cid); + "device due to NM_CONTROLLED/BRIDGE/VLAN.", cid); g_signal_emit_by_name (plugin, NM_SYSTEM_CONFIG_INTERFACE_UNMANAGED_SPECS_CHANGED); } else { /* Wait for the connection to become unmanaged once it knows the diff --git a/system-settings/plugins/ifcfg-rh/reader.c b/system-settings/plugins/ifcfg-rh/reader.c index 51a2075a17..c016c124f5 100644 --- a/system-settings/plugins/ifcfg-rh/reader.c +++ b/system-settings/plugins/ifcfg-rh/reader.c @@ -3288,18 +3288,16 @@ connection_from_file (const char *filename, /* Ignore BRIDGE= and VLAN= connections for now too (rh #619863) */ tmp = svGetValue (parsed, "BRIDGE", FALSE); if (tmp) { - g_set_error (error, ifcfg_plugin_error_quark (), 0, - "Bridge component connections are not yet supported"); g_free (tmp); - goto done; + nm_controlled = FALSE; } - tmp = svGetValue (parsed, "VLAN", FALSE); - if (tmp) { - g_set_error (error, ifcfg_plugin_error_quark (), 0, - "VLAN connections are not yet supported"); - g_free (tmp); - goto done; + if (nm_controlled) { + tmp = svGetValue (parsed, "VLAN", FALSE); + if (tmp) { + g_free (tmp); + nm_controlled = FALSE; + } } /* Construct the connection */