aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2004-01-07 19:47:00 +0000
committerBill Nottingham <notting@redhat.com>2004-01-07 19:47:00 +0000
commit13be9b18ab5a34a992d33eadd7e9e4bf9b37166c (patch)
tree878b9ac911c4140b4ac2ec56193eead658069df3
parentbbcd9a45c8ba3794c6e3132d86553de54d7c9344 (diff)
downloadinitscripts-13be9b18ab5a34a992d33eadd7e9e4bf9b37166c.tar
initscripts-13be9b18ab5a34a992d33eadd7e9e4bf9b37166c.tar.gz
initscripts-13be9b18ab5a34a992d33eadd7e9e4bf9b37166c.tar.bz2
initscripts-13be9b18ab5a34a992d33eadd7e9e4bf9b37166c.tar.xz
initscripts-13be9b18ab5a34a992d33eadd7e9e4bf9b37166c.zip
make bonding support work more transparentlyr6-47-7
-rw-r--r--initscripts.spec5
-rwxr-xr-xsysconfig/network-scripts/ifup2
2 files changed, 5 insertions, 2 deletions
diff --git a/initscripts.spec b/initscripts.spec
index 5c87a85f..ea3e55b5 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,6 +1,6 @@
Summary: The inittab file and the /etc/init.d scripts.
Name: initscripts
-Version: 6.47.6
+Version: 6.47.7
License: GPL
Group: System Environment/Base
Release: 1
@@ -240,6 +240,9 @@ rm -rf $RPM_BUILD_ROOT
%dir /etc/locale/*/LC_MESSAGES
%changelog
+* Wed Jan 7 2004 Bill Nottingham <notting@redhat.com>
+- fix bonding support (#112926)
+
* Mon Dec 15 2003 Bill Nottingham <notting@redhat.com>
- fix summit check in mkkerneldoth (#112116)
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index 2f9e0964..163bdb69 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -126,7 +126,7 @@ if [ "${SLAVE}" = yes -a "${ISALIAS}" = no -a "${MASTER}" != "" -a \
fi
# master device?
-if [ "${TYPE}" = "Bonding" ] || ethtool -i $DEVICE 2>/dev/null| grep -q "driver: bonding" ; then
+if [ "${TYPE}" = "Bonding" -o "$DEVICETYPE" = "bond" ] || ethtool -i $DEVICE 2>/dev/null| grep -q "driver: bonding" ; then
ifconfig ${DEVICE} up
for device in `fgrep -l "MASTER=${DEVICE}" /etc/sysconfig/network-scripts/ifcfg-*` ; do
/sbin/ifup ${device##*/}