Merge pull request #199 from lnykryn/bz1416958

ifup: don't ifup team master indefinitely

diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
index 8f6c1ba9d1218580b386c4f306e1d5c908f8191c..6c049f715f41e3bf02e57bbcd5ed4095d633bd97 100755 (executable)
--- a/modules.d/40network/ifup.sh
+++ b/modules.d/40network/ifup.sh
@@ -282,7 +282,7 @@ if [ -z "$NO_TEAM_MASTER" ]; then
             # 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