diff options
Diffstat (limited to 'src/settings/plugins/ifcfg-rh')
| -rw-r--r-- | src/settings/plugins/ifcfg-rh/reader.c | 24 | ||||
| -rw-r--r-- | src/settings/plugins/ifcfg-rh/writer.c | 6 |
2 files changed, 30 insertions, 0 deletions
diff --git a/src/settings/plugins/ifcfg-rh/reader.c b/src/settings/plugins/ifcfg-rh/reader.c index 6205057b11..ada633acc5 100644 --- a/src/settings/plugins/ifcfg-rh/reader.c +++ b/src/settings/plugins/ifcfg-rh/reader.c @@ -3437,6 +3437,14 @@ make_wired_setting (shvarFile *ifcfg, g_free (value); } + value = svGetValue(ifcfg, "CARRIER_DETECT", FALSE); + if (!value || !strlen (value)) { + g_free (value); + value = g_strdup ("yes"); + } + g_object_set (s_wired, NM_SETTING_WIRED_CARRIER_DETECT, value, NULL); + g_free (value); + return (NMSetting *) s_wired; error: @@ -3546,6 +3554,14 @@ make_infiniband_setting (shvarFile *ifcfg, PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: NM_CONTROLLED was false but HWADDR was missing; device will be managed"); } + value = svGetValue(ifcfg, "CARRIER_DETECT", FALSE); + if (!value || !strlen (value)) { + g_free (value); + value = g_strdup ("yes"); + } + g_object_set (s_infiniband, NM_SETTING_INFINIBAND_CARRIER_DETECT, value, NULL); + g_free (value); + return (NMSetting *) s_infiniband; } @@ -4079,6 +4095,14 @@ make_vlan_setting (shvarFile *ifcfg, parse_prio_map_list (s_vlan, ifcfg, "VLAN_INGRESS_PRIORITY_MAP", NM_VLAN_INGRESS_MAP); parse_prio_map_list (s_vlan, ifcfg, "VLAN_EGRESS_PRIORITY_MAP", NM_VLAN_EGRESS_MAP); + value = svGetValue(ifcfg, "CARRIER_DETECT", FALSE); + if (!value || !strlen (value)) { + g_free (value); + value = g_strdup ("yes"); + } + g_object_set (s_vlan, NM_SETTING_VLAN_CARRIER_DETECT, value, NULL); + g_free (value); + if (out_master) *out_master = svGetValue (ifcfg, "MASTER", FALSE); return (NMSetting *) s_vlan; diff --git a/src/settings/plugins/ifcfg-rh/writer.c b/src/settings/plugins/ifcfg-rh/writer.c index 23a1b5f396..3b2a595502 100644 --- a/src/settings/plugins/ifcfg-rh/writer.c +++ b/src/settings/plugins/ifcfg-rh/writer.c @@ -988,6 +988,8 @@ write_infiniband_setting (NMConnection *connection, shvarFile *ifcfg, GError **e strcmp (transport_mode, "connected") == 0 ? "yes" : "no", FALSE); + svSetValue (ifcfg, "CARRIER_DETECT", nm_setting_infiniband_get_carrier_detect (s_infiniband), FALSE); + svSetValue (ifcfg, "TYPE", TYPE_INFINIBAND, FALSE); return TRUE; @@ -1110,6 +1112,8 @@ write_wired_setting (NMConnection *connection, shvarFile *ifcfg, GError **error) g_string_free (str, TRUE); } + svSetValue (ifcfg, "CARRIER_DETECT", nm_setting_wired_get_carrier_detect (s_wired), FALSE); + svSetValue (ifcfg, "TYPE", TYPE_ETHERNET, FALSE); return TRUE; @@ -1227,6 +1231,8 @@ write_vlan_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wired, } } + svSetValue (ifcfg, "CARRIER_DETECT", nm_setting_vlan_get_carrier_detect (s_vlan), FALSE); + return TRUE; } |