summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-05-19 21:57:10 +0200
committerTom Gundersen <teg@jklm.no>2014-05-19 22:00:35 +0200
commit473dfd7bd5a74b4724818ab8a764c072335fd510 (patch)
tree87f13b49097740c7fb117df9004926a8da3d1d61
parente56f36380365b5825f0920b0f00a459edc0b2e84 (diff)
networkd-wait-online: wait for addresses to be configured
-rw-r--r--TODO5
-rw-r--r--src/network/networkd-wait-online.c4
2 files changed, 5 insertions, 4 deletions
diff --git a/TODO b/TODO
index 9a50afbe8e..e05317d16f 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 3ea7a8384e..0b8e35d693 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;