aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael K. Johnson <johnsonm@redhat.com>1999-08-19 18:59:55 +0000
committerMichael K. Johnson <johnsonm@redhat.com>1999-08-19 18:59:55 +0000
commitc9d0b1cd92948464b126b9199546ecac105d79b4 (patch)
tree7ec051e2300958241899f891ee9bc9f33bae42b5
parent8ff50eae943a153365b4cfac783a9fe96d4808a6 (diff)
downloadinitscripts-c9d0b1cd92948464b126b9199546ecac105d79b4.tar
initscripts-c9d0b1cd92948464b126b9199546ecac105d79b4.tar.gz
initscripts-c9d0b1cd92948464b126b9199546ecac105d79b4.tar.bz2
initscripts-c9d0b1cd92948464b126b9199546ecac105d79b4.tar.xz
initscripts-c9d0b1cd92948464b126b9199546ecac105d79b4.zip
wvdial/too much ifdown-post
-rwxr-xr-xsysconfig/network-scripts/ifdown-ppp5
1 files changed, 2 insertions, 3 deletions
diff --git a/sysconfig/network-scripts/ifdown-ppp b/sysconfig/network-scripts/ifdown-ppp
index a21e47f5..6f1d90ca 100755
--- a/sysconfig/network-scripts/ifdown-ppp
+++ b/sysconfig/network-scripts/ifdown-ppp
@@ -27,7 +27,7 @@ if [ -z "$PID" ]; then
exit 1
fi
-# pppd might have chat as a child; remember chat's pid to kill after pppd.
+# pppd might have chat/wvdial as a child; remember its pid to kill after pppd.
# (After, not before, so that pppd doesn't just restart it).
CHATPID=`ps axl | awk '$4 ~ /^'"$PID"'$/ {print $3}' 2>/dev/null`
@@ -35,12 +35,10 @@ CHATPID=`ps axl | awk '$4 ~ /^'"$PID"'$/ {print $3}' 2>/dev/null`
kill $PID > /dev/null 2>&1
[ -n "$CHATPID" ] && kill $CHATPID > /dev/null 2>&1
if [ ! -d /proc/$PID ]; then
- /etc/sysconfig/network-scripts/ifdown-post $1
exit 0
fi
sleep 2
if [ ! -d /proc/$PID ]; then
- /etc/sysconfig/network-scripts/ifdown-post $1
exit 0
fi
@@ -48,6 +46,7 @@ kill -KILL $PID > /dev/null 2>&1
if [ -d /proc/$PID ]; then
logger -p daemon.info -t ifdown-ppp "ifdown-ppp unable to kill pppd-$DEVICE" &
else
+ # ip-down won't run in this case
/etc/sysconfig/network-scripts/ifdown-post $1
fi