diff options
| author | Nalin Dahyabhai <nalin@redhat.com> | 2000-07-03 04:39:11 +0000 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin@redhat.com> | 2000-07-03 04:39:11 +0000 |
| commit | d5e1319eb786ca89bed79e98a734288a460e8008 (patch) | |
| tree | 960b4135ab1cd40bd9978f0790d8bbd156d8eff0 | |
| parent | 8bcde82afe9aac916f9bf8906172a4caf352c046 (diff) | |
| download | initscripts-r5-25.tar initscripts-r5-25.tar.gz initscripts-r5-25.tar.bz2 initscripts-r5-25.tar.xz initscripts-r5-25.zip | |
fix demand-dialing, now that I can test itr5-25
| -rw-r--r-- | initscripts.spec | 5 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup-ppp | 12 |
2 files changed, 11 insertions, 6 deletions
diff --git a/initscripts.spec b/initscripts.spec index 9851ec1e..9086496c 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.24 +Version: 5.25 Copyright: GPL Group: System Environment/Base Release: 1 @@ -219,6 +219,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Mon Jul 03 2000 Nalin Dahyabhai <nalin@redhat.com> +- fix demand-dialing with PPP + * Sun Jul 02 2000 Trond Eivind Glomsrød <teg@redhat.com> - don't use tail 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 |