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

diff --git a/TODO b/TODO
index 9a50afbe8ed74f0bcb5eb8f6a3c6f6d515f50509..e05317d16fd7ad9580e658a6ccdc9f7c0ec7a886 100644 (file)
--- 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 3ea7a8384ebe15674a98e7c819c08e65b3331dc1..0b8e35d693c7856ef724b2b49fffd8b45eae80ed 100644 (file)
--- 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;