aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2007-01-04 21:47:59 +0000
committerBill Nottingham <notting@redhat.com>2007-01-04 21:47:59 +0000
commit2b7b7655483487772e1458fed00d1eaea199bc5c (patch)
tree15b0d35080e6684219eeb90c1c2748d4504446e4
parent8d3bb1d2b83733e7ff2695a86c9556c2db314325 (diff)
downloadinitscripts-2b7b7655483487772e1458fed00d1eaea199bc5c.tar
initscripts-2b7b7655483487772e1458fed00d1eaea199bc5c.tar.gz
initscripts-2b7b7655483487772e1458fed00d1eaea199bc5c.tar.bz2
initscripts-2b7b7655483487772e1458fed00d1eaea199bc5c.tar.xz
initscripts-2b7b7655483487772e1458fed00d1eaea199bc5c.zip
release bonding slaves properly (#220525)
-rw-r--r--initscripts.spec1
-rwxr-xr-xsysconfig/network-scripts/ifdown-eth2
2 files changed, 3 insertions, 0 deletions
diff --git a/initscripts.spec b/initscripts.spec
index 72ebbffd..930c676a 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -201,6 +201,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
- add bridging docs (#221412, <markmc@redhat.com>)
+- release bonding slaves properly (#220525)
* Tue Dec 19 2006 Bill Nottingham <notting@redhat.com> 8.49-1
- rc.sysinit: remove raidautorn (#219226)
diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/ifdown-eth
index efcd13d8..c0de20e5 100755
--- a/sysconfig/network-scripts/ifdown-eth
+++ b/sysconfig/network-scripts/ifdown-eth
@@ -37,6 +37,7 @@ fi
# Check to make sure the device is actually up
check_device_down ${DEVICE} && [ "$BOOTPROTO" != "dhcp" -a "$BOOTPROTO" != "bootp" ] && [ -n "$VLAN" -a "$VLAN" != "yes" ] && exit 0
+if [ "${SLAVE}" != "yes" -o -z "${MASTER}" ]; then
if [ -n "${HWADDR}" -a -z "${MACADDR}" ]; then
FOUNDMACADDR=`get_hwaddr ${REALDEVICE}`
if [ -n "${FOUNDMACADDR}" -a "${FOUNDMACADDR}" != "${HWADDR}" ]; then
@@ -49,6 +50,7 @@ if [ -n "${HWADDR}" -a -z "${MACADDR}" ]; then
fi
fi
fi
+fi
if is_bonding_device ${DEVICE} ; then
for device in `LANG=C grep -l "^[[:space:]]*MASTER=${DEVICE}" /etc/sysconfig/network-scripts/ifcfg-*` ; do