aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNalin Dahyabhai <nalin@redhat.com>2001-02-28 15:02:54 +0000
committerNalin Dahyabhai <nalin@redhat.com>2001-02-28 15:02:54 +0000
commitcd56db10c17e6319e3fdd9a08bbd2689dc1a7a9c (patch)
treea2d764e593d6bd59680cf4798e6df4a1fbbd948a
parentd27070adf5d0681060d6c9615018c01a374fc8c9 (diff)
downloadinitscripts-cd56db10c17e6319e3fdd9a08bbd2689dc1a7a9c.tar
initscripts-cd56db10c17e6319e3fdd9a08bbd2689dc1a7a9c.tar.gz
initscripts-cd56db10c17e6319e3fdd9a08bbd2689dc1a7a9c.tar.bz2
initscripts-cd56db10c17e6319e3fdd9a08bbd2689dc1a7a9c.tar.xz
initscripts-cd56db10c17e6319e3fdd9a08bbd2689dc1a7a9c.zip
let ppp-watch watch over demand-dialed connections, remove a redundant nodetach (synonymous with -detach)
-rwxr-xr-xsysconfig/network-scripts/ifup-ppp10
1 files changed, 1 insertions, 9 deletions
diff --git a/sysconfig/network-scripts/ifup-ppp b/sysconfig/network-scripts/ifup-ppp
index 11e9e87b..9dd16d38 100755
--- a/sysconfig/network-scripts/ifup-ppp
+++ b/sysconfig/network-scripts/ifup-ppp
@@ -5,9 +5,7 @@ cd /etc/sysconfig/network-scripts
. network-functions
. /etc/rc.d/init.d/functions
-
# ifup-post for PPP is handled through /etc/ppp/ip-up
-
if [ "${1}" = daemon ] ; then
# we've been called from ppp-watch, so don't invoke it for persistence
shift
@@ -16,11 +14,7 @@ else
CONFIG=$(basename $1)
[ -f "${CONFIG}" ] || CONFIG=ifcfg-${1}
source_config
- if [ "${DEMAND}" != yes ] ; then
- # let ppp-watch do the right thing
- shift
- exec /sbin/ppp-watch "${DEVICE}" "$@"
- fi
+ exec /sbin/ppp-watch "${DEVICE}" "$@"
fi
CONFIG=$1
@@ -117,8 +111,6 @@ fi
if [ ${DEMAND} = yes ] ; then
opts="$opts demand ktune idle ${IDLETIMEOUT} holdoff ${RETRYTIMEOUT}"
-else
- opts="$opts nodetach"
fi
(logger -p daemon.info -t ifup-ppp \