From a8f0d88596d8dd2b807a7b0adee272c4f077dade Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 16 Feb 2017 21:53:04 +0100 Subject: [PATCH] ifcfg: ensure ipv4.method is not "disabled" when reading IP addresses from alias files When the main ifcfg file contains no IP addresses, the method will be "disabled". Later, when reading IP addresses for the aliases, we must ensure that the method is manual. Otherwise, validation fails with ip.addresses: this property is not allowed for method=disabled --- src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c index 46bd2de17f..ab0a200e4f 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c @@ -1353,6 +1353,8 @@ read_aliases (NMSettingIPConfig *s_ip4, const char *filename) nm_ip_address_set_attribute (addr, "label", g_variant_new_string (device)); if (!nm_setting_ip_config_add_address (s_ip4, addr)) PARSE_WARNING ("duplicate IP4 address in alias file %s", item); + if (nm_streq0 (nm_setting_ip_config_get_method (s_ip4), NM_SETTING_IP4_CONFIG_METHOD_DISABLED)) + g_object_set (s_ip4, NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_MANUAL, NULL); } else { PARSE_WARNING ("error reading IP4 address from alias file '%s': %s", full_path, err ? err->message : "no address");