From: Tom Gundersen <teg@jklm.no>
Date: Sun, 1 Feb 2015 14:13:17 +0000 (+0100)
Subject: networkd-wait-online: support globbing for ignored devices
X-Git-Tag: v219~205
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=5d8689d749ffc50ade3d5c8598c1d3d11f5240f2

networkd-wait-online: support globbing for ignored devices
---

diff --git a/TODO b/TODO
index e9615cc07..1d9ca394c 100644
--- a/TODO
+++ b/TODO
@@ -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
diff --git a/src/network/networkd-wait-online-manager.c b/src/network/networkd-wait-online-manager.c
index c66470c3e..d1273725f 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;
 }