core: don't require IPv4 configuration during activation
authorDan Williams <dcbw@redhat.com>
Thu, 15 Apr 2010 21:59:29 +0000 (14:59 -0700)
committerDan Williams <dcbw@redhat.com>
Thu, 15 Apr 2010 21:59:29 +0000 (14:59 -0700)
src/nm-device.c

index c5051dc..1ee7510 100644 (file)
@@ -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) {