From d5e1319eb786ca89bed79e98a734288a460e8008 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@redhat.com>
Date: Mon, 3 Jul 2000 04:39:11 +0000
Subject: fix demand-dialing, now that I can test it

---
 sysconfig/network-scripts/ifup-ppp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'sysconfig/network-scripts')

diff --git a/sysconfig/network-scripts/ifup-ppp b/sysconfig/network-scripts/ifup-ppp
index 9e3a20af..2827df36 100755
--- a/sysconfig/network-scripts/ifup-ppp
+++ b/sysconfig/network-scripts/ifup-ppp
@@ -6,18 +6,20 @@ cd /etc/sysconfig/network-scripts
 
 # ifup-post for PPP is handled through /etc/ppp/ip-up
 
-if [ "$1" != daemon ] ; then
+if [ "$1" = daemon ] ; then
+  # we've been called from ppp-watch, so don't invoke it for persistence
+  shift
+else
   # just in case a full path to the configuration file is passed in
   CONFIG=$(basename $1)
   [ -f "$CONFIG" ] || CONFIG=ifcfg-$1
   source_config
   if [ "$DEMAND" != yes ] ; then
-    shift
     # let ppp-watch do the right thing
-    exec /sbin/ppp-watch "$ifcfg" "$@"
+    shift
+    exec /sbin/ppp-watch "${DEVICE}" "$@"
   fi
 fi
-shift
 
 CONFIG=$1
 [ -f "$CONFIG" ] || CONFIG=ifcfg-$1
@@ -84,7 +86,7 @@ if [ "${DEBUG}" = yes ] ; then
   opts="$opts debug"
   chatdbg="-v"
 fi
-if [ ${DEMAND} != yes ] ; then
+if [ ${DEMAND} = yes ] ; then
   if [ -n "${IDLETIMEOUT}" ] ; then
     opts="$opts demand idle ${IDLETIMEOUT}"
   else
-- 
cgit v1.2.1