From cc4e3010dd0421e1ff84140d9fa35e9a8d382554 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 8 Jun 2004 20:36:47 +0000
Subject: cleanup

---
 sysconfig/network-scripts/ifup | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'sysconfig/network-scripts/ifup')

diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index c391cf25..9e89dbd5 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -179,13 +179,10 @@ fi
 # Bonding initialization. For DHCP, we need to enslave the devices early,
 # so it can actually get an IP.
 if [ "${TYPE}" =  "Bonding" ] || ethtool -i $DEVICE 2>/dev/null| grep -q "driver: bonding" ; then
+    /sbin/ip link set dev ${DEVICE} down
     /sbin/ip link set dev ${DEVICE} up
     for device in `fgrep -l "MASTER=${DEVICE}" /etc/sysconfig/network-scripts/ifcfg-*` ; do
         if [ "$BOOTPROTO" = "dhcp" ]; then
-		DEV=$DEVICE
-		eval $(LANG=C fgrep "DEVICE=" $device)
-		ifenslave -d $DEV $DEVICE >/dev/null 2>&1
-		DEVICE=$DEV
 		/sbin/ifup ${device##*/}
     	fi
     done
@@ -358,17 +355,14 @@ fi
 # Bonding initialization part II - for static, enslave the devices. For
 # DHCP, remove any routes for the slaves.
 if [ "${TYPE}" =  "Bonding" ] || ethtool -i $DEVICE 2>/dev/null| grep -q "driver: bonding" ; then
-    #/sbin/ip link set dev ${DEVICE} up
     for device in `fgrep -l "MASTER=${DEVICE}" /etc/sysconfig/network-scripts/ifcfg-*` ; do
-	if [ "$BOOTPROTO" != "dhcp" ]; then
-		/sbin/ifup ${device##*/}
-    	else
+	if [ "$BOOTPROTO" = "dhcp" ]; then
 		DEV=$DEVICE
                 eval $(LANG=C fgrep "DEVICE=" $device)
-		ip link set ${DEVICE} up
-		ip route flush dev ${DEVICE} >/dev/null 2>&1
+		ifenslave -d $DEV DEVICE
 		DEVICE=$DEV
 	fi
+	/sbin/ifup ${device##*/}
     done
 fi
 
-- 
cgit v1.2.1