aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2001-04-02 20:35:11 +0000
committerBill Nottingham <notting@redhat.com>2001-04-02 20:35:11 +0000
commit3a6e6c3dfd753a441182041b0645e3191998a4e3 (patch)
tree9153f5eb5073238070a2c2f02b5d9873e0955cd1
parent071a6d89a8acfb494a9c19743a97e5d4c0d97da1 (diff)
downloadinitscripts-3a6e6c3dfd753a441182041b0645e3191998a4e3.tar
initscripts-3a6e6c3dfd753a441182041b0645e3191998a4e3.tar.gz
initscripts-3a6e6c3dfd753a441182041b0645e3191998a4e3.tar.bz2
initscripts-3a6e6c3dfd753a441182041b0645e3191998a4e3.tar.xz
initscripts-3a6e6c3dfd753a441182041b0645e3191998a4e3.zip
add ifdown-pre-local (#10936)
source /etc/sysconfig/network (#30595) retcode wasn't used. initialize it.
-rwxr-xr-xsysconfig/network-scripts/ifdown20
1 files changed, 18 insertions, 2 deletions
diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown
index 5042c28c..faa0da4e 100755
--- a/sysconfig/network-scripts/ifdown
+++ b/sysconfig/network-scripts/ifdown
@@ -29,6 +29,10 @@ fi
source_config
+if [ -x /sbin/ifdown-pre-local ]; then
+ /sbin/ifdown-pre-local ${DEVICE}
+fi
+
DEVICETYPE=`echo $DEVICE | sed "s/[0-9]*$//"`
OTHERSCRIPT="/etc/sysconfig/network-scripts/ifdown-${DEVICETYPE}"
@@ -36,15 +40,27 @@ if [ -x $OTHERSCRIPT ]; then
exec $OTHERSCRIPT $CONFIG $2
fi
+. /etc/sysconfig/network
+
# Check to make sure the device is actually up
check_device_down && exit 0
+retcode=0
if [ "$BOOTPROTO" = bootp -o "$BOOTPROTO" = dhcp ]; then
- [ -n "`pidof -x pump`" ] && pump -r -i ${DEVICE}
- [ -n "`pidof -x dhcpcd`" ] && dhcpcd -k ${DEVICE}
+ [ -n "`pidof -x pump`" ] && {
+ pump -r -i ${DEVICE}
+ retcode=$?
+ }
+ [ -n "`pidof -x dhcpcd`" ] && {
+ dhcpcd -k ${DEVICE}
+ retcode=$?
+ }
fi
+
ifconfig ${DEVICE} down
+[ "$retcode" = "0" ] && retcode=$?
+
# wait up to 5 seconds for device to actually come down...
waited=0
while ! check_device_down && [ "$waited" -lt 50 ] ; do