system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-14 20:18:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

ifcfg-rh: also read alias file for dhcp connections

Browse source 
Previously, if the main ifcfg file doesn't define any
static ip addresses, any alias files would be ignored.

We should also allow alias files with (pure) 'dhcp' connections,
just like initscripts do.

Reported-by: Marek Hulan <mhulan@redhat.com>
This commit is contained in:
Thomas Haller 2015-06-01 15:28:43 +02:00
parent 900aa016b1
commit 4ef8c0c90c
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/settings/plugins/ifcfg-rh/reader.c
View file

@ -1180,16 +1180,14 @@ read_aliases (NMSettingIPConfig *s_ip4, const char *filename, const char *networ
GDir *dir;
char *dirname, *base;
shvarFile *parsed;
NMIPAddress *base_addr;
NMIPAddress *base_addr = NULL;
GError *err = NULL;
g_return_if_fail (s_ip4 != NULL);
g_return_if_fail (filename != NULL);
if (nm_setting_ip_config_get_num_addresses (s_ip4) == 0)
return;
base_addr = nm_setting_ip_config_get_address (s_ip4, 0);
if (nm_setting_ip_config_get_num_addresses (s_ip4) > 0)
base_addr = nm_setting_ip_config_get_address (s_ip4, 0);
dirname = g_path_get_dirname (filename);
g_return_if_fail (dirname != NULL);