aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--initscripts.spec5
-rwxr-xr-xsysconfig/network-scripts/ifdown-ppp2
-rwxr-xr-xsysconfig/network-scripts/ifup-ppp24
4 files changed, 24 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 53808e1a..4791c15d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+* 2001-09-19 Than Ngo <than@redhat.com>
+ * ChangeLog, initscripts.spec: 6.41-1
+
+ * sysconfig/network-scripts/ifup-ppp, sysconfig/network-scripts/ifdown-ppp:
+ don't show user name by DSL connection
+
2001-09-09 Bill Nottingham <notting@redhat.com>
* ChangeLog, initscripts.spec: 6.40-1
diff --git a/initscripts.spec b/initscripts.spec
index 624f7b69..630c855d 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,6 +1,6 @@
Summary: The inittab file and the /etc/init.d scripts.
Name: initscripts
-Version: 6.40
+Version: 6.41
License: GPL
Group: System Environment/Base
Release: 1
@@ -239,6 +239,9 @@ rm -rf $RPM_BUILD_ROOT
%dir /etc/locale/*/LC_MESSAGES
%changelog
+* Wed Sep 19 2001 Than Ngo <than@redhat.com>
+- don't show user name by DSL connection
+
* Sat Sep 8 2001 Bill Nottingham <notting@redhat.com>
- don't run hwclock --adjust on a read-only filesystem
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}