From a788682bd31937468739a223c28e99cffc72e869 Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Thu, 24 Jul 2014 13:52:13 +0200
Subject: network: tell nm to wake the slaves

---
 rc.d/init.d/network | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'rc.d')

diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index 2f0cc904..ea3ce8f9 100755
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -83,10 +83,11 @@ case "$1" in
 		eval $(LANG=C grep -F "DEVICE=" ifcfg-$i)
 		eval $(LANG=C grep -F "TYPE=" ifcfg-$i)
 		eval $(LANG=C grep -F "SLAVE=" ifcfg-$i)
+		eval $(LANG=C grep -F "NM_CONTROLLED=" ifcfg-$i)
 
 		if [ -z "$DEVICE" ] ; then DEVICE="$i"; fi
 
-		if [ "$SLAVE" = "yes" ]; then
+                if [ "$SLAVE" = "yes" ] && ( ! is_nm_running || is_false $NM_CONTROLLED ) ; then
 			continue
 		fi
 
-- 
cgit v1.2.1