diff options
| author | Daniel Mack <daniel@zonque.org> | 2015-07-29 20:31:02 +0200 |
|---|---|---|
| committer | Daniel Mack <daniel@zonque.org> | 2015-07-29 20:31:02 +0200 |
| commit | 7fc309b3a83c6f8a6f06b9bbea0c5ea379cef68e (patch) | |
| tree | a79f46b09ebc9956f867b8510c519ed8152186b7 | |
| parent | c4a6d5085a8beadb2ea85fbf202b7674bd50bfb3 (diff) | |
| parent | be0c13707dbbc08fb842dbf1cfe162d8cc8cb479 (diff) | |
Merge branch 'pr/761'
| -rw-r--r-- | man/systemd-networkd-wait-online.service.xml | 3 | ||||
| -rw-r--r-- | src/network/networkd-wait-online-manager.c | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/man/systemd-networkd-wait-online.service.xml b/man/systemd-networkd-wait-online.service.xml index f53b337daa..bcc5776a8d 100644 --- a/man/systemd-networkd-wait-online.service.xml +++ b/man/systemd-networkd-wait-online.service.xml @@ -80,7 +80,8 @@ several interfaces which will be configured, but a particular one is necessary to access some network resources. This option may be used more than once to wait for multiple network - interfaces.</para></listitem> + interfaces. When used, all other interfaces are ignored. + </para></listitem> </varlistentry> <varlistentry> <term><option>--ignore=</option></term> diff --git a/src/network/networkd-wait-online-manager.c b/src/network/networkd-wait-online-manager.c index 1fc724f5a4..112d92a568 100644 --- a/src/network/networkd-wait-online-manager.c +++ b/src/network/networkd-wait-online-manager.c @@ -38,9 +38,15 @@ bool manager_ignore_link(Manager *m, Link *link) { assert(m); assert(link); + /* always ignore the loopback interface */ if (link->flags & IFF_LOOPBACK) return true; + /* if interfaces are given on the command line, ignore all others */ + if (m->interfaces && !strv_contains(m->interfaces, link->ifname)) + return true; + + /* ignore interfaces we explicitly are asked to ignore */ STRV_FOREACH(ignore, m->ignore) if (fnmatch(*ignore, link->ifname, 0) == 0) return true; @@ -77,7 +83,7 @@ bool manager_all_configured(Manager *m) { return false; } - if (streq(l->state, "configuring")) { + if (STR_IN_SET(l->state, "configuring", "pending")) { log_debug("link %s is being processed by networkd", l->ifname); return false; |