[PATCH 8/8] bonding: Do not fall back to DHCP if no ip config is present if connection is a bond
- From: Thomas Graf <tgraf redhat com>
- To: networkmanager-list gnome org
- Cc: Thomas Graf <tgraf redhat com>
- Subject: [PATCH 8/8] bonding: Do not fall back to DHCP if no ip config is present if connection is a bond
- Date: Tue, 18 Oct 2011 13:48:49 +0200
Signed-off-by: Thomas Graf <tgraf redhat com>
---
src/nm-device.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/nm-device.c b/src/nm-device.c
index 171db5e..b2631b1 100644
--- a/src/nm-device.c
+++ b/src/nm-device.c
@@ -1704,6 +1704,8 @@ real_act_stage3_ip4_config_start (NMDevice *self, NMDeviceStateReason *reason)
/* If we did not receive IP4 configuration information, default to DHCP */
if (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;
if (!s_ip4 || !method || !strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_AUTO)) {
ret = dhcp4_start (self, connection, reason);
--
1.7.6.4
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]