aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--initscripts.spec5
-rw-r--r--ppp/ip-down5
-rw-r--r--ppp/ip-up6
-rwxr-xr-xsysconfig/network-scripts/ifup-ippp3
-rwxr-xr-xsysconfig/network-scripts/ifup-ppp3
6 files changed, 24 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 184b8212..62198e29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-22 Than Ngo <than@redhat.com>
+ * Changelog, initscripts.spec: 7.39-1
+ * sysconfig/network-scripts/ifup-ippp, sysconfig/network-scripts/ifup-ppp, ppp/ip-down, ppp/ip-up:
+ add support nickname (#105785)
+
2003-10-17 Bill Nottingham <notting@redhat.com>
* ChangeLog, initscripts.spec:
diff --git a/initscripts.spec b/initscripts.spec
index 1de4c20b..f582af8f 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,6 +1,6 @@
Summary: The inittab file and the /etc/init.d scripts.
Name: initscripts
-Version: 7.38
+Version: 7.39
License: GPL
Group: System Environment/Base
Release: 1
@@ -249,6 +249,9 @@ rm -rf $RPM_BUILD_ROOT
%ghost %attr(0664,root,utmp) /var/run/utmp
%changelog
+* Wed Oct 22 2003 Than Ngo <than@redhat.com> 7.39-1
+- add support nickname (#105785)
+
* Fri Oct 17 2003 Bill Nottingham <notting@redhat.com> 7.38-1
- rhgb updates, now pass 'rhgb' to use it, instead of passing 'nogui'
to disable it
diff --git a/ppp/ip-down b/ppp/ip-down
index 3c86f2a6..ae4f60a8 100644
--- a/ppp/ip-down
+++ b/ppp/ip-down
@@ -7,9 +7,12 @@ export PATH
LOGDEVICE=$6
REALDEVICE=$1
+NETWORKDIR=/etc/sysconfig/network-scripts
[ -x /etc/ppp/ip-down.local ] && /etc/ppp/ip-down.local "$@"
-/etc/sysconfig/network-scripts/ifdown-post ifcfg-${LOGDEVICE}
+# get Nickname name of device
+[ -f /etc/ppp/$LOGDEVICE ] && . /etc/ppp/$LOGDEVICE
+[ -f $NETWORKDIR/${NICKNAME} ] && $NETWORKDIR/ifdown-post ${NICKNAME}
exit 0
diff --git a/ppp/ip-up b/ppp/ip-up
index 3b73814f..4ae2b8c0 100644
--- a/ppp/ip-up
+++ b/ppp/ip-up
@@ -7,8 +7,12 @@ export PATH
LOGDEVICE=$6
REALDEVICE=$1
+NETWORKDIR=/etc/sysconfig/network-scripts
-[ -f /etc/sysconfig/network-scripts/ifcfg-${LOGDEVICE} ] && /etc/sysconfig/network-scripts/ifup-post ifcfg-${LOGDEVICE}
+# get Alias name of device
+[ -f /etc/ppp/$LOGDEVICE ] && . /etc/ppp/$LOGDEVICE
+
+[ -f $NETWORKDIR/${NICKNAME} ] && $NETWORKDIR/ifup-post ${NICKNAME}
[ -x /etc/ppp/ip-up.local ] && /etc/ppp/ip-up.local "$@"
diff --git a/sysconfig/network-scripts/ifup-ippp b/sysconfig/network-scripts/ifup-ippp
index e3bbd25e..3c0fd149 100755
--- a/sysconfig/network-scripts/ifup-ippp
+++ b/sysconfig/network-scripts/ifup-ippp
@@ -357,4 +357,7 @@ function addprovider()
addprovider || exit 1
+# save Nickname of device
+rm -f /etc/ppp/$DEVICE && echo "NICKNAME=\"$CONFIG\"" > /etc/ppp/$DEVICE
+
exit 0
diff --git a/sysconfig/network-scripts/ifup-ppp b/sysconfig/network-scripts/ifup-ppp
index 3d26ebe8..5b18b318 100755
--- a/sysconfig/network-scripts/ifup-ppp
+++ b/sysconfig/network-scripts/ifup-ppp
@@ -141,6 +141,9 @@ fi
(logger -p daemon.info -t ifup-ppp \
$"pppd started for ${DEVNAME} on ${MODEMPORT} at ${LINESPEED}" &)&
+# save Nickname of device
+rm -f /etc/ppp/$DEVICE && echo "NICKNAME=\"$CONFIG\"" > /etc/ppp/$DEVICE
+
exec pppd $opts ${MODEMPORT} ${LINESPEED} \
ipparam ${DEVNAME} linkname ${DEVNAME} call ${DEVNAME}\
noauth \