diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-05-30 16:37:28 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-05-30 16:37:28 +0200 |
| commit | f80d0eb29e5fed5798a3d08b37a235d0ceede451 (patch) | |
| tree | 408924eb58447a0445125d4171354e7e3806acb2 | |
| parent | 80c0a37b47da9d6a5dec6d5c88ad58b0ceb6a790 (diff) | |
| download | NetworkManager-f80d0eb29e5fed5798a3d08b37a235d0ceede451.tar.gz | |
ifcfg-rh: use svSetValueInt64_cond() to write MTU value
| -rw-r--r-- | src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c index 9c59c97ed0..a79e0b7305 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c @@ -768,10 +768,8 @@ write_wireless_setting (NMConnection *connection, g_free (blacklist_str); } - svUnsetValue (ifcfg, "MTU"); mtu = nm_setting_wireless_get_mtu (s_wireless); - if (mtu) - svSetValueInt64 (ifcfg, "MTU", mtu); + svSetValueInt64_cond (ifcfg, "MTU", mtu != 0, mtu); ssid = nm_setting_wireless_get_ssid (s_wireless); if (!ssid) { @@ -954,10 +952,8 @@ write_infiniband_setting (NMConnection *connection, shvarFile *ifcfg, GError **e mac = nm_setting_infiniband_get_mac_address (s_infiniband); svSetValueStr (ifcfg, "HWADDR", mac); - svUnsetValue (ifcfg, "MTU"); mtu = nm_setting_infiniband_get_mtu (s_infiniband); - if (mtu) - svSetValueInt64 (ifcfg, "MTU", mtu); + svSetValueInt64_cond (ifcfg, "MTU", mtu != 0, mtu); transport_mode = nm_setting_infiniband_get_transport_mode (s_infiniband); svSetValueBoolean (ifcfg, "CONNECTED_MODE", nm_streq (transport_mode, "connected")); @@ -1018,10 +1014,8 @@ write_wired_setting (NMConnection *connection, shvarFile *ifcfg, GError **error) g_free (blacklist_str); } - svUnsetValue (ifcfg, "MTU"); mtu = nm_setting_wired_get_mtu (s_wired); - if (mtu) - svSetValueInt64 (ifcfg, "MTU", mtu); + svSetValueInt64 (ifcfg, "MTU", mtu != 0, mtu); svUnsetValue (ifcfg, "SUBCHANNELS"); s390_subchannels = nm_setting_wired_get_s390_subchannels (s_wired); @@ -1189,10 +1183,7 @@ write_wired_for_virtual (NMConnection *connection, shvarFile *ifcfg) nm_setting_wired_get_generate_mac_address_mask (s_wired)); mtu = nm_setting_wired_get_mtu (s_wired); - if (mtu) - svSetValueInt64 (ifcfg, "MTU", mtu); - else - svUnsetValue (ifcfg, "MTU"); + svSetValueInt64_cond (ifcfg, "MTU", mtu != 0, mtu); } return has_wired; } |