colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bonding: don't fall back to DHCP if IP config is missing

Browse Source 
If the IP config is missing, we just don't do any IP config, instead
of treating it as DHCP as happens for all other interface types.

Signed-off-by: Thomas Graf <tgraf@redhat.com>
This commit is contained in:
Thomas Graf
2011-10-18 13:48:49 +02:00
committed by Dan Williams
parent b496355b2a
commit ae22fffe23
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nm-device.c
View File

@@ -1529,6 +1529,8 @@ real_act_stage3_ip4_config_start (NMDevice *self,
s_ip4 = nm_connection_get_setting_ip4_config (connection); s_ip4 = nm_connection_get_setting_ip4_config (connection);
if (s_ip4) if (s_ip4)
method = nm_setting_ip4_config_get_method (s_ip4); method = nm_setting_ip4_config_get_method (s_ip4);
else if (nm_connection_is_type (connection, NM_SETTING_BOND_SETTING_NAME))
method = NM_SETTING_IP4_CONFIG_METHOD_DISABLED;
/* Start IPv4 addressing based on the method requested */ /* Start IPv4 addressing based on the method requested */
if (strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_AUTO) == 0) if (strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_AUTO) == 0)