From: Tom Gundersen <teg@jklm.no>
Date: Mon, 19 May 2014 19:57:10 +0000 (+0200)
Subject: networkd-wait-online: wait for addresses to be configured
X-Git-Tag: v213~77
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=473dfd7bd5a74b4724818ab8a764c072335fd510

networkd-wait-online: wait for addresses to be configured
---

diff --git a/TODO b/TODO
index 9a50afbe8..e05317d16 100644
--- a/TODO
+++ b/TODO
@@ -709,9 +709,8 @@ Features:
    - add veth netdev support (c.f. http://shorewall.net/bridge-Shorewall-perl.html#veth)
    - add tun/tap netdev support
 
-* dhcp:
-   - export timezone information
-   - FORCERENEW
+* networkd-wait-online:
+   - make operstates to wait for configurable?
 
 * dhcp:
    - export timezone information
diff --git a/src/network/networkd-wait-online.c b/src/network/networkd-wait-online.c
index 3ea7a8384..0b8e35d69 100644
--- a/src/network/networkd-wait-online.c
+++ b/src/network/networkd-wait-online.c
@@ -183,7 +183,9 @@ static bool all_configured(Manager *m) {
                         return false;
 
                 r = sd_network_get_link_operational_state(indices[i], &oper_state);
-                if (r >= 0 && streq(oper_state, "carrier"))
+                if (r >= 0 &&
+                    (streq(oper_state, "degraded") ||
+                     streq(oper_state, "routable")))
                         /* we wait for at least one link to be ready,
                            regardless of who manages it */
                         one_ready = true;