diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-02-01 15:13:17 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-02-02 11:57:52 +0100 |
| commit | 5d8689d749ffc50ade3d5c8598c1d3d11f5240f2 (patch) | |
| tree | ed0a7b56c1b17ab1c0b6c5aeb241461ad91f91d2 /src/network | |
| parent | 3cc711193df8f11daf30c918ec2dc4c0bfe04715 (diff) | |
networkd-wait-online: support globbing for ignored devices
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/networkd-wait-online-manager.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/network/networkd-wait-online-manager.c b/src/network/networkd-wait-online-manager.c index c66470c3e2..d1273725f0 100644 --- a/src/network/networkd-wait-online-manager.c +++ b/src/network/networkd-wait-online-manager.c @@ -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; } |