chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd-wait-online: support globbing for ignored devices
[elogind.git]
/
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 c66470c3e27f275065d8492164b765f174d6f0bd..d1273725f075c835c9765d0681d6717f0eaf8b7a 100644
(file)
--- 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 <netinet/ether.h>
#include <linux/if.h>
+#include <fnmatch.h>
#include "rtnl-util.h"
#include "rtnl-util.h"
@@
-32,14
+33,17
@@
#include "util.h"
bool manager_ignore_link(Manager *m, Link *link) {
#include "util.h"
bool manager_ignore_link(Manager *m, Link *link) {
+ char **ignore;
+
assert(m);
assert(link);
if (link->flags & IFF_LOOPBACK)
return true;
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;
}
return false;
}