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 6f392febe78a39f2233cb518dba70df75ab90b0b..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"
 


@@ -31,6 +32,22 @@
 
 #include "util.h"
 
 
 #include "util.h"
 

+bool manager_ignore_link(Manager *m, Link *link) {
+        char **ignore;
+
+        assert(m);
+        assert(link);
+
+        if (link->flags & IFF_LOOPBACK)
+                return true;
+
+        STRV_FOREACH(ignore, m->ignore)
+                if (fnmatch(*ignore, link->ifname, 0) == 0)
+                        return true;
+
+        return false;
+}
+

 bool manager_all_configured(Manager *m) {
         Iterator i;
         Link *l;
 bool manager_all_configured(Manager *m) {
         Iterator i;
         Link *l;


@@ -49,8 +66,8 @@ bool manager_all_configured(Manager *m) {
         /* wait for all links networkd manages to be in admin state 'configured'
            and at least one link to gain a carrier */
         HASHMAP_FOREACH(l, m->links, i) {
         /* wait for all links networkd manages to be in admin state 'configured'
            and at least one link to gain a carrier */
         HASHMAP_FOREACH(l, m->links, i) {

-                if (!link_relevant(l)) {
-                        log_info("ignore irrelevant link: %s", l->ifname);
+                if (manager_ignore_link(m, l)) {
+                        log_info("ignoring: %s", l->ifname);

                         continue;
                 }
 
                         continue;
                 }
 


@@ -245,7 +262,7 @@ static int manager_network_monitor_listen(Manager *m) {
         return 0;
 }
 
         return 0;
 }
 

-int manager_new(Manager **ret, char **interfaces) {
+int manager_new(Manager **ret, char **interfaces, char **ignore) {

         _cleanup_(manager_freep) Manager *m = NULL;
         int r;
 
         _cleanup_(manager_freep) Manager *m = NULL;
         int r;
 


@@ -256,6 +273,7 @@ int manager_new(Manager **ret, char **interfaces) {
                 return -ENOMEM;
 
         m->interfaces = interfaces;
                 return -ENOMEM;
 
         m->interfaces = interfaces;

+        m->ignore = ignore;

 
         r = sd_event_default(&m->event);
         if (r < 0)
 
         r = sd_event_default(&m->event);
         if (r < 0)