diff options
| author | Than Ngo <than@redhat.com> | 2001-06-22 13:28:41 +0000 |
|---|---|---|
| committer | Than Ngo <than@redhat.com> | 2001-06-22 13:28:41 +0000 |
| commit | a3530cb7cbcc75341c8835a5fa34313631db8062 (patch) | |
| tree | bcfaf5b6768d86fe66cb1d352a8e8968698a3129 | |
| parent | ab2eaa4b07aeb0a24609219d53c55031abce4172 (diff) | |
| download | initscripts-a3530cb7cbcc75341c8835a5fa34313631db8062.tar initscripts-a3530cb7cbcc75341c8835a5fa34313631db8062.tar.gz initscripts-a3530cb7cbcc75341c8835a5fa34313631db8062.tar.bz2 initscripts-a3530cb7cbcc75341c8835a5fa34313631db8062.tar.xz initscripts-a3530cb7cbcc75341c8835a5fa34313631db8062.zip | |
* add support xDSLr5-92
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | initscripts.spec | 5 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifdown-ppp | 7 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup-ppp | 15 |
4 files changed, 29 insertions, 4 deletions
@@ -1,3 +1,9 @@ +2001-06-22 Than Ngo <than@redhat.com> + * initscripts.spec: 5.92-1 + + * sysconfig/network-scripts/ifup-ppp sysconfig/network-scripts/ifdown-ppp + add support xDSL + 2001-06-21 Bill Nottingham <notting@redhat.com> * initscripts.spec: 5.91-1 diff --git a/initscripts.spec b/initscripts.spec index f54d4d5f..ca1fc7f9 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.91 +Version: 5.92 License: GPL Group: System Environment/Base Release: 1 @@ -221,6 +221,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Fri Jun 22 2001 Than Ngo <than@redhat.com> +- add support xDSL + * Thu Jun 21 2001 Bill Nottingham <notting@redhat.com> - more networking script fixes (#45364) - add stuff for unmounting /initrd diff --git a/sysconfig/network-scripts/ifdown-ppp b/sysconfig/network-scripts/ifdown-ppp index b629673c..9270de39 100755 --- a/sysconfig/network-scripts/ifdown-ppp +++ b/sysconfig/network-scripts/ifdown-ppp @@ -1,4 +1,4 @@ -#!/bin/bash +#! /bin/bash PATH=/sbin:/usr/sbin:/bin:/usr/bin cd /etc/sysconfig/network-scripts @@ -7,6 +7,11 @@ cd /etc/sysconfig/network-scripts CONFIG=$1 source_config +if [ "$TYPE" = "xDSL" -a -x /usr/sbin/adsl-stop ] ; then + adsl-stop /etc/sysconfig/network-scripts/$CONFIG + exit $? +fi + if [ "${DEMAND}" = "yes" -a -f /var/run/ppp-${DEVICE}.pid ] ; then PID=`head -1 /var/run/ppp-${DEVICE}.pid` kill -TERM ${PID} diff --git a/sysconfig/network-scripts/ifup-ppp b/sysconfig/network-scripts/ifup-ppp index 9dd16d38..ebc4dca1 100755 --- a/sysconfig/network-scripts/ifup-ppp +++ b/sysconfig/network-scripts/ifup-ppp @@ -1,4 +1,4 @@ -#!/bin/bash +#! /bin/bash PATH=/sbin:/usr/sbin:/bin:/usr/bin cd /etc/sysconfig/network-scripts @@ -14,7 +14,8 @@ else CONFIG=$(basename $1) [ -f "${CONFIG}" ] || CONFIG=ifcfg-${1} source_config - exec /sbin/ppp-watch "${DEVICE}" "$@" + # don't start ppp-watch by xDSL + [ "$TYPE" = "xDSL" ] || exec /sbin/ppp-watch "${DEVICE}" "$@" fi CONFIG=$1 @@ -45,6 +46,16 @@ fi exit 1 } +# check that xDSL connection +if [ "$TYPE" = "xDSL" -a -x /usr/sbin/adsl-start ] ; then + adsl-start "$ETH" "$USER" /etc/sysconfig/network-scripts/$CONFIG + exit $? +else + logger -p daemon.info -t ifup-ppp \ + $"/usr/sbin/adsl-start does not exist or is not executable for ${DEVICE}" + exit 1 +fi + PEERCONF=/etc/ppp/peers/${DEVNAME} if [ ! -f ${PEERCONF} ]; then |