summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-06-28 16:21:58 +0200
committerTom Gundersen <teg@jklm.no>2014-06-29 15:18:21 +0200
commitfb6730c4989e3ad561ec67c70cbd01819824e438 (patch)
tree0001dbf803e826f37c0e569d4068ae9ae3304382
parente1ea665edac17d75fce01b72dadfa3211b60df2c (diff)
networkd: set static addresses immediately
Don't wait for IPv4LL nor DHCP to finish before setting statically configured addresses.
-rw-r--r--src/network/networkd-link.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 82e517e78c..4c75fa3d38 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) {