diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2016-02-24 13:13:09 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2016-02-24 16:54:27 +0100 |
| commit | 2e2f56697fd4c0d285eea277ebab3a8f883eaccd (patch) | |
| tree | 4e12fbd0336ce4bf0794b82ff43632fc29255d69 | |
| parent | 7d1709d7f6495b242943bd1ef7397dc75b15c055 (diff) | |
| download | NetworkManager-2e2f56697fd4c0d285eea277ebab3a8f883eaccd.tar.gz | |
ifcfg-rh: short circuit the IP configuration parsing on IPv4LL
We need the other keys, such as may_fail, too.
| -rw-r--r-- | src/settings/plugins/ifcfg-rh/reader.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/settings/plugins/ifcfg-rh/reader.c b/src/settings/plugins/ifcfg-rh/reader.c index 5d4375cc09..c8871a55a8 100644 --- a/src/settings/plugins/ifcfg-rh/reader.c +++ b/src/settings/plugins/ifcfg-rh/reader.c @@ -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; |