From 5e6ae3b226ecf6b05924b8d4113501fa2c4a82ea Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Thu, 15 Apr 2010 14:59:29 -0700
Subject: [PATCH] core: don't require IPv4 configuration during activation

---
 src/nm-device.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/nm-device.c b/src/nm-device.c
index c5051dc99b..1ee7510321 100644
--- a/src/nm-device.c
+++ b/src/nm-device.c
@@ -1674,7 +1674,8 @@ real_act_stage4_get_ip4_config (NMDevice *self,
 			*config = nm_device_new_ip4_shared_config (self, reason);
 			if (*config)
 				priv->dnsmasq_manager = nm_dnsmasq_manager_new (ip_iface);
-		}
+		} else if (!strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_DISABLED))
+			ret = NM_ACT_STAGE_RETURN_SUCCESS;
 	}
 
 	if (!*config) {