diff options
| author | Dan Winship <danw@gnome.org> | 2014-01-28 09:25:59 -0500 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-01-30 11:16:44 -0500 |
| commit | 7b85fb6f783847940bf1f9edd6923ff9d6c34ae6 (patch) | |
| tree | 9d7e21a7a0635b116bcc92a867586c66197dc36f | |
| parent | 3bb54e20849469eccca565b3e69a544541adcbaf (diff) | |
| download | NetworkManager-7b85fb6f783847940bf1f9edd6923ff9d6c34ae6.tar.gz | |
ifcfg-rh: write SLAVE=yes on bond slave connections
For compatibility with the old network scripts.
| -rw-r--r-- | src/settings/plugins/ifcfg-rh/reader.c | 4 | ||||
| -rw-r--r-- | src/settings/plugins/ifcfg-rh/writer.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/settings/plugins/ifcfg-rh/reader.c b/src/settings/plugins/ifcfg-rh/reader.c index 57cfc1b39f..41055a2d2e 100644 --- a/src/settings/plugins/ifcfg-rh/reader.c +++ b/src/settings/plugins/ifcfg-rh/reader.c @@ -1755,6 +1755,10 @@ check_if_bond_slave (shvarFile *ifcfg, NULL); g_free (value); } + + /* We should be checking for SLAVE=yes as well, but NM used to not set that, + * so for backward-compatibility, we don't check. + */ } static void diff --git a/src/settings/plugins/ifcfg-rh/writer.c b/src/settings/plugins/ifcfg-rh/writer.c index 604d492a1d..ec1478f24b 100644 --- a/src/settings/plugins/ifcfg-rh/writer.c +++ b/src/settings/plugins/ifcfg-rh/writer.c @@ -1698,9 +1698,10 @@ write_connection_setting (NMSettingConnection *s_con, shvarFile *ifcfg) master = nm_setting_connection_get_master (s_con); if (master) { - if (nm_setting_connection_is_slave_type (s_con, NM_SETTING_BOND_SETTING_NAME)) + if (nm_setting_connection_is_slave_type (s_con, NM_SETTING_BOND_SETTING_NAME)) { svSetValue (ifcfg, "MASTER", master, FALSE); - else if (nm_setting_connection_is_slave_type (s_con, NM_SETTING_BRIDGE_SETTING_NAME)) + svSetValue (ifcfg, "SLAVE", "yes", FALSE); + } else if (nm_setting_connection_is_slave_type (s_con, NM_SETTING_BRIDGE_SETTING_NAME)) svSetValue (ifcfg, "BRIDGE", master, FALSE); else if (nm_setting_connection_is_slave_type (s_con, NM_SETTING_TEAM_SETTING_NAME)) { svSetValue (ifcfg, "TEAM_MASTER", master, FALSE); |