ifcfg-rh: short circuit the IP configuration parsing on IPv4LL
authorLubomir Rintel <lkundrak@v3.sk>
Wed, 24 Feb 2016 12:13:09 +0000 (13:13 +0100)
committerLubomir Rintel <lkundrak@v3.sk>
Wed, 24 Feb 2016 15:54:27 +0000 (16:54 +0100)
We need the other keys, such as may_fail, too.

src/settings/plugins/ifcfg-rh/reader.c

index 5d4375c..c8871a5 100644 (file)
@@ -973,12 +973,7 @@ make_ip4_setting (shvarFile *ifcfg,
                else
                        method = NM_SETTING_IP4_CONFIG_METHOD_DISABLED;
        } else if (!g_ascii_strcasecmp (value, "autoip")) {
-               g_free (value);
-               g_object_set (s_ip4,
-                             NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL,
-                             NM_SETTING_IP_CONFIG_NEVER_DEFAULT, never_default,
-                             NULL);
-               return NM_SETTING (s_ip4);
+               method = NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL;
        } else if (!g_ascii_strcasecmp (value, "shared")) {
                int idx;