aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--initscripts.spec6
-rw-r--r--sysconfig.txt4
-rwxr-xr-xsysconfig/network-scripts/ifdown-ppp6
-rwxr-xr-xsysconfig/network-scripts/ifup-ppp5
4 files changed, 15 insertions, 6 deletions
diff --git a/initscripts.spec b/initscripts.spec
index 2554e443..617f77e2 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -10,7 +10,7 @@ BuildRoot: /var/tmp/initbld
Requires: mingetty, bash, /bin/awk, /bin/sed, mktemp, e2fsprogs, console-tools
Requires: procps, modutils >= 2.1.85-3, sysklogd >= 1.3.31
Requires: setup >= 2.0.3
-Conflicts: kernel <= 2.2, timeconfig < 3.0
+Conflicts: kernel <= 2.2, timeconfig < 3.0, pppd < 2.3.9
Prereq: /sbin/chkconfig, /usr/sbin/groupadd, gawk
%description
@@ -194,6 +194,10 @@ rm -rf $RPM_BUILD_ROOT
%ghost %attr(0664,root,utmp) /var/run/utmp
%changelog
+* Fri Aug 13 1999 Michael K. Johnson <johnsonm@redhat.com>
+- use new linkname argument to pppd to make if{up,down}-ppp
+ reliable -- requires ppp-2.3.9 or higher
+
* Mon Aug 2 1999 Bill Nottingham <notting@redhat.com>
- fix typo.
- add 'make check'
diff --git a/sysconfig.txt b/sysconfig.txt
index 101a6dfc..cdba4c64 100644
--- a/sysconfig.txt
+++ b/sysconfig.txt
@@ -235,8 +235,10 @@ Files in /etc/sysconfig/network-scripts/
think... :-)
Base items:
+ NAME=<friendly name for users to see>
+ Most important for PPP. Only used in front ends.
DEVICE=<name of physical device (except dynamically-allocated PPP
- devices where it is the "logical name")
+ devices where it is the "logical name")>
IPADDR=
NETMASK=
GATEWAY=
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