From 9e2431f245ee24bd7d5c270a2d7920b037b67532 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 28 2017 15:11:07 +0000
Subject: import dracut-033-463.el7_3.2


---

diff --git a/SOURCES/0494-ifup-don-t-ifup-team-master-indefinitely.patch b/SOURCES/0494-ifup-don-t-ifup-team-master-indefinitely.patch
new file mode 100644
index 0000000..993f849
--- /dev/null
+++ b/SOURCES/0494-ifup-don-t-ifup-team-master-indefinitely.patch
@@ -0,0 +1,24 @@
+From ea8bef9893f51797eb9312dbb145112297401f47 Mon Sep 17 00:00:00 2001
+From: Lukas Nykryn <lnykryn@redhat.com>
+Date: Thu, 2 Feb 2017 13:02:10 +0100
+Subject: [PATCH] ifup: don't ifup team master indefinitely
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1416958
+Thanks to martin.moore@hpe.com for the patch
+---
+ modules.d/40network/ifup.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
+index b5c9ad2..f2b5894 100755
+--- a/modules.d/40network/ifup.sh
++++ b/modules.d/40network/ifup.sh
+@@ -280,7 +280,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
diff --git a/SPECS/dracut.spec b/SPECS/dracut.spec
index a066981..66366ee 100644
--- a/SPECS/dracut.spec
+++ b/SPECS/dracut.spec
@@ -10,7 +10,7 @@
 
 Name: dracut
 Version: 033
-Release: 463%{?dist}.1
+Release: 463%{?dist}.2
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel}
@@ -492,7 +492,7 @@ Patch460: 0460-network-parse-ip-opts-be-more-liberal-to-multiple-ip.patch
 Patch461: 0461-network-fix-dhcp-classless_static_routes.patch
 Patch462: 0462-network-do-not-check-firmware-boot-selected-flag.patch
 Patch463: 0492-network-ifup-write-override-file-before-dhcp_do.patch
-
+Patch464: 0494-ifup-don-t-ifup-team-master-indefinitely.patch
 
 BuildRequires: bash git
 
@@ -921,6 +921,10 @@ rm -rf -- $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed May 24 2017 Lukáš Nykrýn <lnykryn@redhat.com> - 033-463.2
+- ifup: don't ifup team master indefinitely
+Resolves: rhbz#1454799
+
 * Wed Apr 26 2017 Lukáš Nykrýn <lnykryn@redhat.com> - 033-463.1
 - network/ifup: write override file before dhcp_do
 Resolves: rhbz#1415004