aboutsummaryrefslogtreecommitdiffstats
path: root/sysconfig
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2006-10-19 19:27:51 +0000
committerBill Nottingham <notting@redhat.com>2006-10-19 19:27:51 +0000
commite91a2802f3a7becc7d4cc99bd26bc968e89c1c97 (patch)
tree7091a56059df50ddd8eb1182090882956e9f7b55 /sysconfig
parentee8269c53d600cc20dfb90d4c061ca61559e10ac (diff)
downloadinitscripts-e91a2802f3a7becc7d4cc99bd26bc968e89c1c97.tar
initscripts-e91a2802f3a7becc7d4cc99bd26bc968e89c1c97.tar.gz
initscripts-e91a2802f3a7becc7d4cc99bd26bc968e89c1c97.tar.bz2
initscripts-e91a2802f3a7becc7d4cc99bd26bc968e89c1c97.tar.xz
initscripts-e91a2802f3a7becc7d4cc99bd26bc968e89c1c97.zip
just enslave once. seems to work now
Diffstat (limited to 'sysconfig')
-rwxr-xr-xsysconfig/network-scripts/ifup-eth28
1 files changed, 2 insertions, 26 deletions
diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index fd0d4bc2..7c94e310 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -123,12 +123,10 @@ if [ "$ISALIAS" = no ] && is_bonding_device ${DEVICE} ; then
/sbin/ip link set dev ${DEVICE} up
[ -n "${LINKDELAY}" ] && /bin/sleep ${LINKDELAY}
- if [ "$BOOTPROTO" = "dhcp" ]; then
- for device in `LANG=C grep -l "^[[:space:]]*MASTER=${DEVICE}" /etc/sysconfig/network-scripts/ifcfg-*` ; do
+ for device in `LANG=C grep -l "^[[:space:]]*MASTER=${DEVICE}" /etc/sysconfig/network-scripts/ifcfg-*` ; do
is_ignored_file "$device" && continue
/sbin/ifup ${device##*/}
- done
- fi
+ done
fi
# this isn't the same as the MAC in the configuration filename. It is
@@ -204,13 +202,6 @@ else
/sbin/ethtool -s ${REALDEVICE} $ETHTOOL_OPTS
fi
[ -n "${LINKDELAY}" ] && /bin/sleep ${LINKDELAY}
- # Bonding initialization part II
- if is_bonding_device ${DEVICE} ; then
- for device in `LANG=C grep -l "^[[:space:]]*MASTER=${DEVICE}" /etc/sysconfig/network-scripts/ifcfg-*` ; do
- is_ignored_file "$device" && continue
- /sbin/ifup ${device##*/}
- done
- fi
if [ "${NETWORKING_IPV6}" = "yes" ]; then
/etc/sysconfig/network-scripts/ifup-ipv6 ${CONFIG}
@@ -280,21 +271,6 @@ else
fi
fi
-# Bonding initialization part II - for static, enslave the devices. For
-# DHCP, remove any routes for the slaves.
-if is_bonding_device ${DEVICE} ; then
- for device in `LANG=C grep -l "^[[:space:]]*MASTER=${DEVICE}" /etc/sysconfig/network-scripts/ifcfg-*` ; do
- is_ignored_file "$device" && continue
- if [ "$BOOTPROTO" = "dhcp" ]; then
- DEV=$DEVICE
- (. $device
- echo "-${DEVICE}" > /sys/class/net/${DEV}/bonding/slaves 2>/dev/null
- )
- fi
- /sbin/ifup ${device##*/}
- done
-fi
-
# Add Zeroconf route.
if [ -z "${NOZEROCONF}" -a "${ISALIAS}" = "no" -a "${REALDEVICE}" != "lo" ]; then
ip route replace 169.254.0.0/16 dev ${REALDEVICE}