diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-06-02 09:48:14 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-06-30 08:29:54 +0200 |
| commit | dab657043caf65afcf3e8c2e639d4e977d25ba6f (patch) | |
| tree | dd0efb25f2c393e952fd3af3867a6bdddd4ff3fc | |
| parent | c7b7305b5938b8a4b8b77f65c459f5c89708c2d0 (diff) | |
| download | NetworkManager-dab657043caf65afcf3e8c2e639d4e977d25ba6f.tar.gz | |
ifcfg-rh: explicitly clear HWADDR setting and others in write_wired_for_virtual()
When modifying an existing ifcfg-rh file, we always want to enforce
the absense of a certain setting. That is done, by calling svSetValue()
with a value of NULL.
Same for writing MTU value.
| -rw-r--r-- | src/settings/plugins/ifcfg-rh/writer.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/settings/plugins/ifcfg-rh/writer.c b/src/settings/plugins/ifcfg-rh/writer.c index 2de8a9a1f7..1683a0e33c 100644 --- a/src/settings/plugins/ifcfg-rh/writer.c +++ b/src/settings/plugins/ifcfg-rh/writer.c @@ -1255,19 +1255,18 @@ write_wired_for_virtual (NMConnection *connection, shvarFile *ifcfg) has_wired = TRUE; device_mac = nm_setting_wired_get_mac_address (s_wired); - if (device_mac) - svSetValue (ifcfg, "HWADDR", device_mac, FALSE); + svSetValue (ifcfg, "HWADDR", device_mac, FALSE); cloned_mac = nm_setting_wired_get_cloned_mac_address (s_wired); - if (cloned_mac) - svSetValue (ifcfg, "MACADDR", cloned_mac, FALSE); + svSetValue (ifcfg, "MACADDR", cloned_mac, FALSE); mtu = nm_setting_wired_get_mtu (s_wired); if (mtu) { tmp = g_strdup_printf ("%u", mtu); svSetValue (ifcfg, "MTU", tmp, FALSE); g_free (tmp); - } + } else + svSetValue (ifcfg, "MTU", NULL, FALSE); } return has_wired; } |