From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 5 Feb 2020 09:16:29 +0000 (+0100)
Subject: Merge pull request #14536 from DaanDeMeyer/wait-online-max-operstate
X-Git-Tag: v245-rc1~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=239bf9409de373cd5057142dd632dde8adb51b82;p=thirdparty%2Fsystemd.git

Merge pull request #14536 from DaanDeMeyer/wait-online-max-operstate

wait-online: add maximum operational state option
---

239bf9409de373cd5057142dd632dde8adb51b82
diff --cc src/network/wait-online/manager.c
index 0e6a284da2f,4734ce28ee5..40a29f19aa0
--- a/src/network/wait-online/manager.c
+++ b/src/network/wait-online/manager.c
@@@ -29,10 -29,10 +29,10 @@@ static bool manager_ignore_link(Manage
                  return true;
  
          /* ignore interfaces we explicitly are asked to ignore */
 -        return strv_fnmatch(m->ignore, link->ifname, 0);
 +        return strv_fnmatch(m->ignore, link->ifname);
  }
  
- static int manager_link_is_online(Manager *m, Link *l, LinkOperationalState s) {
+ static int manager_link_is_online(Manager *m, Link *l, LinkOperationalStateRange s) {
          /* This returns the following:
           * -EAGAIN: not processed by udev or networkd
           *       0: operstate is not enough