chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: link - drop assert from _free()
[elogind.git]
/
src
/
network
/
networkd-wait-online.c
diff --git
a/src/network/networkd-wait-online.c
b/src/network/networkd-wait-online.c
index 3ea7a8384ebe15674a98e7c819c08e65b3331dc1..c6038c63bfaa77d534e86de38a83d3de7ca354ed 100644
(file)
--- a/
src/network/networkd-wait-online.c
+++ b/
src/network/networkd-wait-online.c
@@
-124,7
+124,7
@@
static bool all_configured(Manager *m) {
r = sd_rtnl_message_new_link(m->rtnl, &message, RTM_GETLINK, 0);
if (r < 0) {
r = sd_rtnl_message_new_link(m->rtnl, &message, RTM_GETLINK, 0);
if (r < 0) {
- log_warning("co
lu
d not create GETLINK message: %s", strerror(-r));
+ log_warning("co
ul
d not create GETLINK message: %s", strerror(-r));
return false;
}
return false;
}
@@
-183,7
+183,9
@@
static bool all_configured(Manager *m) {
return false;
r = sd_network_get_link_operational_state(indices[i], &oper_state);
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;
/* we wait for at least one link to be ready,
regardless of who manages it */
one_ready = true;