aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2003-09-15 05:40:21 +0000
committerBill Nottingham <notting@redhat.com>2003-09-15 05:40:21 +0000
commit30ca006ae718fcd856ff3fa3783218233a0736aa (patch)
treeaf41ff94184c07abd1a9f768d2798770ea718b1c
parentb64be488902cccb3f4e10396a93777caa107b1d9 (diff)
downloadinitscripts-30ca006ae718fcd856ff3fa3783218233a0736aa.tar
initscripts-30ca006ae718fcd856ff3fa3783218233a0736aa.tar.gz
initscripts-30ca006ae718fcd856ff3fa3783218233a0736aa.tar.bz2
initscripts-30ca006ae718fcd856ff3fa3783218233a0736aa.tar.xz
initscripts-30ca006ae718fcd856ff3fa3783218233a0736aa.zip
ppp fixes (#104128, #97845, #85447)
-rw-r--r--src/ppp-watch.c6
-rwxr-xr-xsysconfig/network-scripts/ifdown-ppp6
-rwxr-xr-xsysconfig/network-scripts/ifup-ppp2
3 files changed, 8 insertions, 6 deletions
diff --git a/src/ppp-watch.c b/src/ppp-watch.c
index 6f27e850..37ad5203 100644
--- a/src/ppp-watch.c
+++ b/src/ppp-watch.c
@@ -609,7 +609,7 @@ main(int argc, char **argv) {
dying = TRUE;
/* Get the pid of our child pppd. */
- pppLogicalToPhysical(&pppdPid, real_device, NULL);
+ pppLogicalToPhysical(&pppdPid, device, NULL);
/* We don't know what our child pid is. This is very confusing. */
if (!pppdPid) {
@@ -639,7 +639,7 @@ main(int argc, char **argv) {
ifcfg = shvarfilesGet(device);
/* Get the PID of our child pppd. */
- pppLogicalToPhysical(&pppdPid, real_device, NULL);
+ pppLogicalToPhysical(&pppdPid, device, NULL);
kill(pppdPid, SIGTERM);
/* We'll redial when the SIGCHLD arrives, even if PERSIST is
@@ -657,7 +657,7 @@ main(int argc, char **argv) {
if (theSigio) {
theSigio = 0;
- pppLogicalToPhysical(NULL, real_device, &physicalDevice);
+ pppLogicalToPhysical(NULL, device, &physicalDevice);
if (physicalDevice) {
if (interfaceIsUp(physicalDevice)) {
/* The interface is up, so report a success to a parent if
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