chiark / gitweb /
networkd: set static addresses immediately
authorTom Gundersen <teg@jklm.no>
Sat, 28 Jun 2014 14:21:58 +0000 (16:21 +0200)
committerTom Gundersen <teg@jklm.no>
Sun, 29 Jun 2014 13:18:21 +0000 (15:18 +0200)
Don't wait for IPv4LL nor DHCP to finish before setting statically configured addresses.

src/network/networkd-link.c

index 82e517e..4c75fa3 100644 (file)
@@ -1756,10 +1756,7 @@ static int link_enslaved(Link *link) {
                 }
         }
 
                 }
         }
 
-        if ((link->network->dhcp == DHCP_SUPPORT_NONE) && !link->network->ipv4ll)
-                return link_enter_set_addresses(link);
-
-        return 0;
+        return link_enter_set_addresses(link);
 }
 
 static int enslave_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
 }
 
 static int enslave_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {