fix bonding+dhcp (#91399); bring bonding device links up, then bring up slaves, then bring up bonding interface fully

2 files changed, 11 insertions, 0 deletions

diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index d47006d1..add82281 100755
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -88,6 +88,9 @@ case "$1" in
 		if LANG=C egrep -L "^ONBOOT=\"?[Nn][Oo]\"?" ifcfg-$i > /dev/null ; then
 			continue
 		fi
+		if LANG=C egrep -L "^SLAVE=\"?[Yy][Ee][Ss]\"?" ifcfg-$i > /dev/null ; then
+		        continue
+		fi
 		# If we're in confirmation mode, get user confirmation
 		[ -n "$CONFIRM" ]  && 
 			{ 
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index 47b6d385..8e609072 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -125,6 +125,14 @@ if [ "${SLAVE}" = yes -a "${ISALIAS}" = no -a "${MASTER}" != "" -a \
     exit 0
 fi
 
+# master device?
+if [ "${TYPE}" =  "Bonding" ] || ethtool -i $DEVICE | grep -q "driver: bonding" ; then
+    ifconfig ${DEVICE} up
+    for device in `fgrep -l "MASTER=${DEVICE}" /etc/sysconfig/network-scripts/ifcfg-*` ; do
+        /sbin/ifup ${device##*/}
+    done
+fi
+
 # this isn't the same as the MAC in the configuration filename.  It is
 # available as a configuration option in the config file, forcing the kernel
 # to think an ethernet card has a different MAC address than it really has.