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

ifcfg-rh: treat BRIDGE and VLAN connections as unmanaged (rh #619863)

Browse source 
Treat them as unmanaged for now so that they dont' need NM_CONTROLLEd=no
which would require further configuration when NM does start to support
these configs.
This commit is contained in:
Dan Williams 2010-08-04 16:01:01 -05:00
parent 006377f9d2
commit 7f85ba04a3
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
system-settings/plugins/ifcfg-rh/plugin.c
View file

@ -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

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

@ -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 */