aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--initscripts.spec5
-rwxr-xr-xsysconfig/network-scripts/ifup-ppp11
2 files changed, 10 insertions, 6 deletions
diff --git a/initscripts.spec b/initscripts.spec
index 4dd22784..263ee077 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,6 +1,6 @@
Summary: The inittab file and the /etc/init.d scripts.
Name: initscripts
-Version: 5.48
+Version: 5.49
Copyright: GPL
Group: System Environment/Base
Release: 1
@@ -232,6 +232,9 @@ rm -rf $RPM_BUILD_ROOT
%ghost %attr(0664,root,utmp) /var/run/utmp
%changelog
+* Wed Aug 23 2000 Nalin Dahyabhai <nalin@redhat.com>
+- set "holdoff ${RETRYTIMEOUT} ktune" for demand-dialed PPP links
+
* Tue Aug 22 2000 Bill Nottingham <notting@redhat.com>
- update documentation (#15475)
diff --git a/sysconfig/network-scripts/ifup-ppp b/sysconfig/network-scripts/ifup-ppp
index fb9ce790..af44875d 100755
--- a/sysconfig/network-scripts/ifup-ppp
+++ b/sysconfig/network-scripts/ifup-ppp
@@ -33,6 +33,10 @@ if [ -z "${RETRYTIMEOUT}" ]; then
RETRYTIMEOUT=30
fi
+if [ -z "${IDLETIMEOUT}" ]; then
+ IDLETIMEOUT=600
+fi
+
if [ "${2}" = "boot" -a "${ONBOOT}" = "no" ]; then
exit
fi
@@ -86,12 +90,9 @@ if [ "${DEBUG}" = yes ] ; then
opts="$opts debug"
chatdbg="-v"
fi
+
if [ ${DEMAND} = yes ] ; then
- if [ -n "${IDLETIMEOUT}" ] ; then
- opts="$opts demand idle ${IDLETIMEOUT}"
- else
- opts="$opts demand idle 600"
- fi
+ opts="$opts demand ktune idle ${IDLETIMEOUT} holdoff ${RETRYTIMEOUT}"
else
opts="$opts nodetach"
fi