]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #14536 from DaanDeMeyer/wait-online-max-operstate
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 5 Feb 2020 09:16:29 +0000 (10:16 +0100)
committerGitHub <noreply@github.com>
Wed, 5 Feb 2020 09:16:29 +0000 (10:16 +0100)
wait-online: add maximum operational state option

1  2 
man/networkctl.xml
man/systemd.network.xml
src/network/networkd-link.c
src/network/networkd-network.c
src/network/networkd-network.h
src/network/wait-online/manager.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0e6a284da2f2dcbf4370c74a2c9013c56bc1bb29,4734ce28ee5c1fbec2fa121adb15ac3eff5a87ef..40a29f19aa0d098ffc529cf45539189114c5e2e1
@@@ -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