]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
networkd-wait-online: fix race
authorTom Gundersen <teg@jklm.no>
Tue, 28 Jul 2015 23:34:35 +0000 (01:34 +0200)
committerTom Gundersen <teg@jklm.no>
Tue, 28 Jul 2015 23:45:46 +0000 (01:45 +0200)
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.

src/network/networkd-wait-online-manager.c

index 1fc724f5a43da6e5f11b7678ff65fa83ed6e95b9..7a557a728e47eafd419e1f2fb3a99f7a7d52370f 100644 (file)
@@ -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;