picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

networkd-wait-online: support globbing for ignored devices

This commit is contained in:
Tom Gundersen 2015-02-01 15:13:17 +01:00
parent 3cc711193d
commit 5d8689d749
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@ -34,8 +34,6 @@ External:
Features: Features:
* network-wait-online should support globbing for interfaces.
* network-wait-online should have a configurable timeout, maybe as --timeout-usec= * network-wait-online should have a configurable timeout, maybe as --timeout-usec=
* The udev blkid built-in should expose a property that reflects * The udev blkid built-in should expose a property that reflects

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

@ -21,6 +21,7 @@
#include <netinet/ether.h> #include <netinet/ether.h>
#include <linux/if.h> #include <linux/if.h>
#include <fnmatch.h>
#include "rtnl-util.h" #include "rtnl-util.h"
@ -32,14 +33,17 @@
#include "util.h" #include "util.h"
bool manager_ignore_link(Manager *m, Link *link) { bool manager_ignore_link(Manager *m, Link *link) {
char **ignore;
assert(m); assert(m);
assert(link); assert(link);
if (link->flags & IFF_LOOPBACK) if (link->flags & IFF_LOOPBACK)
return true; return true;
if (strv_contains(m->ignore, link->ifname)) STRV_FOREACH(ignore, m->ignore)
return true; if (fnmatch(*ignore, link->ifname, 0) == 0)
return true;
return false; return false;
} }