From cb6fa44cb5411ed574f14109ee862ff663ab0a36 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Fri, 28 Feb 2014 02:07:29 +0100 Subject: sd-network: turn states 'unknown' and 'unmanaged' into errnos --- src/network/networkd-wait-online.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'src/network/networkd-wait-online.c') diff --git a/src/network/networkd-wait-online.c b/src/network/networkd-wait-online.c index 900dc05125..51c6bbd495 100644 --- a/src/network/networkd-wait-online.c +++ b/src/network/networkd-wait-online.c @@ -38,20 +38,15 @@ static bool all_configured(void) { _cleanup_free_ char *state = NULL; r = sd_network_get_link_state(indices[i], &state); - if (r < 0) + if (r == -EUNATCH) + continue; + if (r < 0 || !streq(state, "configured")) return false; - if (streq(state, "configured")) - one_ready = true; - - if (!streq(state, "configured") && !streq(state, "unmanaged")) - return false; + one_ready = true; } - if (one_ready) - return true; - - return false; + return one_ready; } static int event_handler(sd_event_source *s, int fd, uint32_t revents, -- cgit v1.2.3-54-g00ecf