From 79b1f37d95f08fe7620b071eec51d2810ed077c9 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Thu, 29 Jan 2015 07:34:34 +0100 Subject: networkd-wait-online: allow specific devices to be ignored In addition to the loopback device, also explicitly configured devices to be ignored. Suggested by Charles Devereaux . --- src/network/networkd-wait-online-manager.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'src/network/networkd-wait-online-manager.c') diff --git a/src/network/networkd-wait-online-manager.c b/src/network/networkd-wait-online-manager.c index 6f392febe7..c66470c3e2 100644 --- a/src/network/networkd-wait-online-manager.c +++ b/src/network/networkd-wait-online-manager.c @@ -31,6 +31,19 @@ #include "util.h" +bool manager_ignore_link(Manager *m, Link *link) { + assert(m); + assert(link); + + if (link->flags & IFF_LOOPBACK) + return true; + + if (strv_contains(m->ignore, link->ifname)) + return true; + + return false; +} + bool manager_all_configured(Manager *m) { Iterator i; Link *l; @@ -49,8 +62,8 @@ bool manager_all_configured(Manager *m) { /* wait for all links networkd manages to be in admin state 'configured' and at least one link to gain a carrier */ HASHMAP_FOREACH(l, m->links, i) { - if (!link_relevant(l)) { - log_info("ignore irrelevant link: %s", l->ifname); + if (manager_ignore_link(m, l)) { + log_info("ignoring: %s", l->ifname); continue; } @@ -245,7 +258,7 @@ static int manager_network_monitor_listen(Manager *m) { return 0; } -int manager_new(Manager **ret, char **interfaces) { +int manager_new(Manager **ret, char **interfaces, char **ignore) { _cleanup_(manager_freep) Manager *m = NULL; int r; @@ -256,6 +269,7 @@ int manager_new(Manager **ret, char **interfaces) { return -ENOMEM; m->interfaces = interfaces; + m->ignore = ignore; r = sd_event_default(&m->event); if (r < 0) -- cgit v1.2.3-54-g00ecf