summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-05-08 13:11:23 +0200
committerTom Gundersen <teg@jklm.no>2014-05-08 15:27:55 +0200
commitd91d3c1580ee3c50139eec8ab794c634a54044fb (patch)
treee4f9ec1f2685fdd871e3816301565c8c3991bf88 /src
parent75adc2189bb3b4f993e50f5160c9dff3efaec0b1 (diff)
networkd-wait-online: fix false positives when checking if a link is managed by networkd
Diffstat (limited to 'src')
-rw-r--r--src/network/networkd-wait-online.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/network/networkd-wait-online.c b/src/network/networkd-wait-online.c
index a4729f464f..a42fef26b9 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"))