From: Tom Gundersen <teg@jklm.no>
Date: Tue, 28 Jul 2015 23:34:35 +0000 (+0200)
Subject: networkd-wait-online: fix race
X-Git-Tag: v224~21^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79ac8ba9735b53fb805bdc3f6f9edeccf3985a43;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/src/network/networkd-wait-online-manager.c b/src/network/networkd-wait-online-manager.c
index 1fc724f5a43..7a557a728e4 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;