networkd-wait-online: support globbing for ignored devices

This commit is contained in:
Tom Gundersen
2015-02-02 11:57:52 +01:00
parent 3cc711193d
commit 5d8689d749
2 changed files with 6 additions and 4 deletions
-2
View File
@@ -34,8 +34,6 @@ External:
Features:
* network-wait-online should support globbing for interfaces.
* network-wait-online should have a configurable timeout, maybe as --timeout-usec=
* The udev blkid built-in should expose a property that reflects
+6 -2
View File
@@ -21,6 +21,7 @@
#include <netinet/ether.h>
#include <linux/if.h>
#include <fnmatch.h>
#include "rtnl-util.h"
@@ -32,14 +33,17 @@
#include "util.h"
bool manager_ignore_link(Manager *m, Link *link) {
char **ignore;
assert(m);
assert(link);
if (link->flags & IFF_LOOPBACK)
return true;
if (strv_contains(m->ignore, link->ifname))
return true;
STRV_FOREACH(ignore, m->ignore)
if (fnmatch(*ignore, link->ifname, 0) == 0)
return true;
return false;
}