aboutsummaryrefslogtreecommitdiffstats
path: root/sysconfig/network-scripts
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2010-01-12 17:00:22 -0500
committerBill Nottingham <notting@redhat.com>2010-01-12 17:00:22 -0500
commitd4c58cd1c84f99030c3f4778d2c64377838e0634 (patch)
treedfc2936864558666bb33706050b3bdaa1e80b056 /sysconfig/network-scripts
parentb9bef01af3a42c87f213dfa825965e146b4b8966 (diff)
downloadinitscripts-d4c58cd1c84f99030c3f4778d2c64377838e0634.tar
initscripts-d4c58cd1c84f99030c3f4778d2c64377838e0634.tar.gz
initscripts-d4c58cd1c84f99030c3f4778d2c64377838e0634.tar.bz2
initscripts-d4c58cd1c84f99030c3f4778d2c64377838e0634.tar.xz
initscripts-d4c58cd1c84f99030c3f4778d2c64377838e0634.zip
The adsl-* and pppd programs have been in /usr/sbin for ~10 years.
Ergo, stop checking if they're in /sbin.
Diffstat (limited to 'sysconfig/network-scripts')
-rwxr-xr-xsysconfig/network-scripts/ifdown-ppp2
-rwxr-xr-xsysconfig/network-scripts/ifup-ppp4
2 files changed, 3 insertions, 3 deletions
diff --git a/sysconfig/network-scripts/ifdown-ppp b/sysconfig/network-scripts/ifdown-ppp
index 0775f170..2827c7e5 100755
--- a/sysconfig/network-scripts/ifdown-ppp
+++ b/sysconfig/network-scripts/ifdown-ppp
@@ -6,7 +6,7 @@ cd /etc/sysconfig/network-scripts
CONFIG=$1
source_config
-if [ "$TYPE" = "xDSL" ] && [ -x /sbin/adsl-stop -o -x /usr/sbin/adsl-stop ] ; then
+if [ "$TYPE" = "xDSL" ] && [ -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 2a317a61..fb30639d 100755
--- a/sysconfig/network-scripts/ifup-ppp
+++ b/sysconfig/network-scripts/ifup-ppp
@@ -41,7 +41,7 @@ if [ "${2}" = "boot" -a "${ONBOOT}" = "no" ]; then
exit
fi
-[ -x /sbin/pppd -o -x /usr/sbin/pppd ] || {
+[ -x /usr/sbin/pppd ] || {
echo $"pppd does not exist or is not executable"
echo $"ifup-ppp for ${DEVICE} exiting"
/usr/bin/logger -p daemon.info -t ifup-ppp \
@@ -51,7 +51,7 @@ fi
# check that xDSL connection
if [ "$TYPE" = "xDSL" ] ; then
- if [ -x /sbin/adsl-start -o -x /usr/sbin/adsl-start ] ; then
+ if [ -x /usr/sbin/adsl-start ] ; then
adsl-start /etc/sysconfig/network-scripts/$CONFIG
exit $?
else