aboutsummaryrefslogtreecommitdiffstats
path: root/sysconfig
diff options
context:
space:
mode:
authorThan Ngo <than@redhat.com>2001-09-19 17:56:49 +0000
committerThan Ngo <than@redhat.com>2001-09-19 17:56:49 +0000
commit4091c4484942817ab3360a204180f40735c01436 (patch)
tree8a1df329541021aa66c435f86230d36af9dbcdc0 /sysconfig
parentb4ef0a651227d7ec469539f22a14cac5514ee86e (diff)
downloadinitscripts-4091c4484942817ab3360a204180f40735c01436.tar
initscripts-4091c4484942817ab3360a204180f40735c01436.tar.gz
initscripts-4091c4484942817ab3360a204180f40735c01436.tar.bz2
initscripts-4091c4484942817ab3360a204180f40735c01436.tar.xz
initscripts-4091c4484942817ab3360a204180f40735c01436.zip
* don't show user name by DSL connection
Diffstat (limited to 'sysconfig')
-rwxr-xr-xsysconfig/network-scripts/ifdown-ppp2
-rwxr-xr-xsysconfig/network-scripts/ifup-ppp24
2 files changed, 14 insertions, 12 deletions
diff --git a/sysconfig/network-scripts/ifdown-ppp b/sysconfig/network-scripts/ifdown-ppp
index 9270de39..d867897f 100755
--- a/sysconfig/network-scripts/ifdown-ppp
+++ b/sysconfig/network-scripts/ifdown-ppp
@@ -7,7 +7,7 @@ cd /etc/sysconfig/network-scripts
CONFIG=$1
source_config
-if [ "$TYPE" = "xDSL" -a -x /usr/sbin/adsl-stop ] ; then
+if [ "$TYPE" = "xDSL" ] && [ -x /sbin/adsl-stop -o -x /usr/sbin/adsl-stop ] ; then
adsl-stop /etc/sysconfig/network-scripts/$CONFIG
exit $?
fi
diff --git a/sysconfig/network-scripts/ifup-ppp b/sysconfig/network-scripts/ifup-ppp
index ca4a326e..6ad80664 100755
--- a/sysconfig/network-scripts/ifup-ppp
+++ b/sysconfig/network-scripts/ifup-ppp
@@ -38,22 +38,24 @@ if [ "${2}" = "boot" -a "${ONBOOT}" = "no" ]; then
exit
fi
-[ -x /usr/sbin/pppd ] || {
- echo $"/usr/sbin/pppd does not exist or is not executable"
+[ -x /sbin/pppd -o -x /usr/sbin/pppd ] || {
+ echo $"pppd does not exist or is not executable"
echo $"ifup-ppp for ${DEVICE} exiting"
logger -p daemon.info -t ifup-ppp \
- $"/usr/sbin/pppd does not exist or is not executable for ${DEVICE}"
+ $"pppd does not exist or is not executable for ${DEVICE}"
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 $?
-elif [ "$TYPE" = "xDSL" ]; then
- logger -p daemon.info -t ifup-ppp \
- $"/usr/sbin/adsl-start does not exist or is not executable for ${DEVICE}"
- exit 1
+if [ "$TYPE" = "xDSL" ] ; then
+ if [ -x /sbin/adsl-start -o -x /usr/sbin/adsl-start ] ; then
+ adsl-start /etc/sysconfig/network-scripts/$CONFIG
+ exit $?
+ else
+ logger -p daemon.info -t ifup-ppp \
+ $"adsl-start does not exist or is not executable for ${DEVICE}"
+ exit 1
+ fi
fi
PEERCONF=/etc/ppp/peers/${DEVNAME}
@@ -130,7 +132,7 @@ fi
(logger -p daemon.info -t ifup-ppp \
$"pppd started for ${DEVNAME} on ${MODEMPORT} at ${LINESPEED}" &)&
-exec /usr/sbin/pppd -detach $opts ${MODEMPORT} ${LINESPEED} \
+exec pppd -detach $opts ${MODEMPORT} ${LINESPEED} \
ipparam ${DEVNAME} linkname ${DEVNAME} call ${DEVNAME}\
noauth \
${PPPOPTIONS}