diff options
author | Bill Nottingham <notting@redhat.com> | 2003-09-15 05:40:21 +0000 |
---|---|---|
committer | Bill Nottingham <notting@redhat.com> | 2003-09-15 05:40:21 +0000 |
commit | 30ca006ae718fcd856ff3fa3783218233a0736aa (patch) | |
tree | af41ff94184c07abd1a9f768d2798770ea718b1c /sysconfig/network-scripts | |
parent | b64be488902cccb3f4e10396a93777caa107b1d9 (diff) | |
download | initscripts-30ca006ae718fcd856ff3fa3783218233a0736aa.tar initscripts-30ca006ae718fcd856ff3fa3783218233a0736aa.tar.gz initscripts-30ca006ae718fcd856ff3fa3783218233a0736aa.tar.bz2 initscripts-30ca006ae718fcd856ff3fa3783218233a0736aa.tar.xz initscripts-30ca006ae718fcd856ff3fa3783218233a0736aa.zip |
ppp fixes (#104128, #97845, #85447)
Diffstat (limited to 'sysconfig/network-scripts')
-rwxr-xr-x | sysconfig/network-scripts/ifdown-ppp | 6 | ||||
-rwxr-xr-x | sysconfig/network-scripts/ifup-ppp | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sysconfig/network-scripts/ifdown-ppp b/sysconfig/network-scripts/ifdown-ppp index 4d8cfb75..9455d48a 100755 --- a/sysconfig/network-scripts/ifdown-ppp +++ b/sysconfig/network-scripts/ifdown-ppp @@ -11,8 +11,10 @@ if [ "$TYPE" = "xDSL" ] && [ -x /sbin/adsl-stop -o -x /usr/sbin/adsl-stop ] ; th exit $? fi -if [ "${DEMAND}" = "yes" -a -f /var/run/ppp-${DEVICE}.pid ] ; then - PID=`head -1 /var/run/ppp-${DEVICE}.pid` +CONFIG=${CONFIG##ifcfg-} + +if [ "${DEMAND}" = "yes" -a -f /var/run/ppp-${CONFIG}.pid ] ; then + PID=`head -1 /var/run/ppp-${CONFIG}.pid` kill -TERM ${PID} sleep 2 [ ! -d /proc/${PID} ] && exit 0 diff --git a/sysconfig/network-scripts/ifup-ppp b/sysconfig/network-scripts/ifup-ppp index 99b0e79f..3d26ebe8 100755 --- a/sysconfig/network-scripts/ifup-ppp +++ b/sysconfig/network-scripts/ifup-ppp @@ -18,7 +18,7 @@ else if [ "${DEMAND}" != yes -a "$TYPE" != "xDSL" ] ; then # let ppp-watch do the right thing shift - exec /sbin/ppp-watch "${DEVICE}" "$2" + exec /sbin/ppp-watch "${CONFIG##ifcfg-}" "$2" fi fi |