From: Tom Gundersen <teg@jklm.no>
Date: Thu, 8 May 2014 11:11:23 +0000 (+0200)
Subject: networkd-wait-online: fix false positives when checking if a link is managed by networkd
X-Git-Tag: v213~219
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=d91d3c1580ee3c50139eec8ab794c634a54044fb;ds=sidebyside

networkd-wait-online: fix false positives when checking if a link is managed by networkd
---

diff --git a/src/network/networkd-wait-online.c b/src/network/networkd-wait-online.c
index a4729f464..a42fef26b 100644
--- a/src/network/networkd-wait-online.c
+++ b/src/network/networkd-wait-online.c
@@ -178,10 +178,9 @@ static bool all_configured(Manager *m) {
                         continue;
 
                 r = sd_network_get_link_state(indices[i], &state);
-                if (r != -EUNATCH && (r < 0 || !streq(state, "configured"))) {
-                        /* managed by networkd, but not yet configured */
+                if (r == -EBUSY || (r >= 0 && !streq(state, "configured")))
+                        /* not yet processed by udev, or managed by networkd, but not yet configured */
                         return false;
-                }
 
                 r = sd_network_get_link_operational_state(indices[i], &oper_state);
                 if (r >= 0 && streq(oper_state, "carrier"))