aboutsummaryrefslogtreecommitdiffstats
path: root/sysconfig/network-scripts
diff options
context:
space:
mode:
authorMichael K. Johnson <johnsonm@redhat.com>1999-08-13 20:10:06 +0000
committerMichael K. Johnson <johnsonm@redhat.com>1999-08-13 20:10:06 +0000
commit3ec78dca9e6dee50cda7e5aed7410a9c2104b04b (patch)
tree8e35ea11b990da6a0820d8aee40186640694bbca /sysconfig/network-scripts
parentd77f3918fbdb6d51fa70ce3f22c45e5600645f2c (diff)
downloadinitscripts-3ec78dca9e6dee50cda7e5aed7410a9c2104b04b.tar
initscripts-3ec78dca9e6dee50cda7e5aed7410a9c2104b04b.tar.gz
initscripts-3ec78dca9e6dee50cda7e5aed7410a9c2104b04b.tar.bz2
initscripts-3ec78dca9e6dee50cda7e5aed7410a9c2104b04b.tar.xz
initscripts-3ec78dca9e6dee50cda7e5aed7410a9c2104b04b.zip
use new pppd
Diffstat (limited to 'sysconfig/network-scripts')
-rwxr-xr-xsysconfig/network-scripts/ifdown-ppp6
-rwxr-xr-xsysconfig/network-scripts/ifup-ppp5
2 files changed, 7 insertions, 4 deletions
diff --git a/sysconfig/network-scripts/ifdown-ppp b/sysconfig/network-scripts/ifdown-ppp
index 97cd04bc..a21e47f5 100755
--- a/sysconfig/network-scripts/ifdown-ppp
+++ b/sysconfig/network-scripts/ifdown-ppp
@@ -7,12 +7,12 @@ cd /etc/sysconfig/network-scripts
CONFIG=$1
source_config
-if [ ! -f /var/run/ppp-$DEVICE.dev ]; then
+if [ ! -f /var/run/ppp-$DEVICE.pid ]; then
# ppp isn't running, or we didn't start it
exit 0
fi
-file=/var/run/`cat /var/run/ppp-$DEVICE.dev`.pid
+file=/var/run/ppp-$DEVICE.pid
# signals ifup-ppp not to persist -- must do this before exiting if PPP
# has not yet started ($file does not exist).
@@ -22,7 +22,7 @@ if [ ! -f $file ]; then
exit 0
fi
-PID=`cat $file`
+PID=`head -1 $file`
if [ -z "$PID" ]; then
exit 1
fi
diff --git a/sysconfig/network-scripts/ifup-ppp b/sysconfig/network-scripts/ifup-ppp
index ef5b0281..bb314aca 100755
--- a/sysconfig/network-scripts/ifup-ppp
+++ b/sysconfig/network-scripts/ifup-ppp
@@ -91,16 +91,17 @@ while : ; do
(logger -p daemon.info -t ifup-ppp \
"pppd started for $DEVICE on $MODEMPORT at $LINESPEED" &)&
- > /var/run/ppp-$DEVICE.dev
if [ -n "$WVDIALSECT" ] ; then
/usr/sbin/pppd -detach $opts $MODEMPORT $LINESPEED \
remotename $DEVICE ipparam $DEVICE \
${PPPOPTIONS} \
+ linkname $DEVICE \
connect "/usr/bin/wvdial --chat $WVDIALSECT"
else
/usr/sbin/pppd -detach $opts $MODEMPORT $LINESPEED \
remotename $DEVICE ipparam $DEVICE \
${PPPOPTIONS} \
+ linkname $DEVICE \
connect "/usr/sbin/chat $chatdbg -f $CHATSCRIPT"
fi
@@ -127,11 +128,13 @@ while : ; do
sleep $timeout || {
# sleep was killed
rm -f /var/run/ppp-$DEVICE.dev
+ rm -f /var/run/ppp-$DEVICE.pid
exit 0
}
# exit if our lock file disappeared while we slept
if [ ! -f /var/run/ppp-$DEVICE.dev ]; then
+ rm -f /var/run/ppp-$DEVICE.pid
exit 0
fi
done