summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2015-07-29 01:34:35 +0200
committerTom Gundersen <teg@jklm.no>2015-07-29 01:45:46 +0200
commit79ac8ba9735b53fb805bdc3f6f9edeccf3985a43 (patch)
tree204b014aba5cf16c1085c3b73f94b44d94fa12c7 /src
parent0a05b6b760455a7bb50f8d5f3c9f6b74302547b7 (diff)
networkd-wait-online: fix race
We must consider 'pending' links as if they may be managed by networkd, as this is the state we enter before deciding wether networkd should manage the link or not, so we better wait for this decision being made.
Diffstat (limited to 'src')
-rw-r--r--src/network/networkd-wait-online-manager.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/networkd-wait-online-manager.c b/src/network/networkd-wait-online-manager.c
index 1fc724f5a4..7a557a728e 100644
--- a/src/network/networkd-wait-online-manager.c
+++ b/src/network/networkd-wait-online-manager.c
@@ -77,7 +77,7 @@ bool manager_all_configured(Manager *m) {
return false;
}
- if (streq(l->state, "configuring")) {
+ if (STR_IN_SET(l->state, "configuring", "pending")) {
log_debug("link %s is being processed by networkd",
l->ifname);
return false;