From: Tom Gundersen <teg@jklm.no>
Date: Sat, 28 Jun 2014 14:21:58 +0000 (+0200)
Subject: networkd: set static addresses immediately
X-Git-Tag: v215~127
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=fb6730c4989e3ad561ec67c70cbd01819824e438;ds=sidebyside

networkd: set static addresses immediately

Don't wait for IPv4LL nor DHCP to finish before setting statically configured addresses.
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 82e517e78..4c75fa3d3 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -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) {