From: Harald Hoyer <harald@redhat.com>
Date: Tue, 21 Mar 2017 12:33:41 +0000 (+0100)
Subject: Merge pull request #199 from lnykryn/bz1416958
X-Git-Tag: 045~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd4aa2574136052894af23fb64b02acb8551d4e9;hp=-c;p=thirdparty%2Fdracut.git

Merge pull request #199 from lnykryn/bz1416958

ifup: don't ifup team master indefinitely
---

bd4aa2574136052894af23fb64b02acb8551d4e9
diff --combined modules.d/40network/ifup.sh
index 8f6c1ba9d,1f7dc1c66..6c049f715
--- a/modules.d/40network/ifup.sh
+++ b/modules.d/40network/ifup.sh
@@@ -282,7 -282,7 +282,7 @@@ if [ -z "$NO_TEAM_MASTER" ]; the
              # wait for all slaves to show up
              for slave in $teamslaves ; do
                  # try to create the slave (maybe vlan or bridge)
-                 NO_BOND_MASTER=yes NO_AUTO_DHCP=yes ifup $slave
+                 NO_TEAM_MASTER=yes NO_AUTO_DHCP=yes ifup $slave
  
                  if ! ip link show dev $slave >/dev/null 2>&1; then
                      # wait for the last slave to show up
@@@ -376,11 -376,6 +376,11 @@@ for p in $(getargs ip=); d
      # If this option isn't directed at our interface, skip it
      [ -n "$dev" ] && [ "$dev" != "$netif" ] && continue
  
 +    # Store config for later use
 +    for i in ip srv gw mask hostname macaddr mtu dns1 dns2; do
 +        eval '[ "$'$i'" ] && echo '$i'="$'$i'"'
 +    done > /tmp/net.$netif.override
 +
      for autoopt in $(str_replace "$autoconf" "," " "); do
          case $autoopt in
              dhcp|on|any)
@@@ -402,6 -397,11 +402,6 @@@
          echo nameserver $s >> /tmp/net.$netif.resolv.conf
      done
  
 -    # Store config for later use
 -    for i in ip srv gw mask hostname macaddr mtu dns1 dns2; do
 -        eval '[ "$'$i'" ] && echo '$i'="$'$i'"'
 -    done > /tmp/net.$netif.override
 -
      if [ $ret -eq 0 ]; then
          > /tmp/net.${netif}.up