shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-28 20:25:38 +03:00
Code

Merge branch 'pr/761'

Browse Source
This commit is contained in:
Daniel Mack 2015-07-29 20:31:02 +02:00
commit 7fc309b3a8
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
man/systemd-networkd-wait-online.service.xml
View File

@ -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>

8
src/network/networkd-wait-online-manager.c
View File

@ -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;