aboutsummaryrefslogtreecommitdiffstats
path: root/sysconfig/network-scripts
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2004-06-08 20:36:13 +0000
committerBill Nottingham <notting@redhat.com>2004-06-08 20:36:13 +0000
commit3e7155900665856adfd804e8ce9c6e6bf8941f77 (patch)
tree25733113891e56d3310d964d02bed493703ce4b2 /sysconfig/network-scripts
parent5bda93462103efaf18447f3c9c3f48db90954e80 (diff)
downloadinitscripts-3e7155900665856adfd804e8ce9c6e6bf8941f77.tar
initscripts-3e7155900665856adfd804e8ce9c6e6bf8941f77.tar.gz
initscripts-3e7155900665856adfd804e8ce9c6e6bf8941f77.tar.bz2
initscripts-3e7155900665856adfd804e8ce9c6e6bf8941f77.tar.xz
initscripts-3e7155900665856adfd804e8ce9c6e6bf8941f77.zip
cleanup
Diffstat (limited to 'sysconfig/network-scripts')
-rwxr-xr-xsysconfig/network-scripts/ifup14
1 files changed, 4 insertions, 10 deletions
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index 1b48685b..4f8c2ad4 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -215,13 +215,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
@@ -394,17 +391,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