aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ppp/ip-down5
-rw-r--r--ppp/ip-up6
-rwxr-xr-xsysconfig/network-scripts/ifup-ippp5
-rwxr-xr-xsysconfig/network-scripts/ifup-ppp3
5 files changed, 8 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 62198e29..636da15b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
2003-10-22 Than Ngo <than@redhat.com>
+ * Changelog, initscripts.spec: 7.40-1
+ * sysconfig/network-scripts/ifup-ippp, sysconfig/network-scripts/ifup-ppp, ppp/ip-down, ppp/ip-up:
+ add better fix to support nickname (#105785)
+
+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)
diff --git a/ppp/ip-down b/ppp/ip-down
index ae4f60a8..3c86f2a6 100644
--- a/ppp/ip-down
+++ b/ppp/ip-down
@@ -7,12 +7,9 @@ export PATH
LOGDEVICE=$6
REALDEVICE=$1
-NETWORKDIR=/etc/sysconfig/network-scripts
[ -x /etc/ppp/ip-down.local ] && /etc/ppp/ip-down.local "$@"
-# get Nickname name of device
-[ -f /etc/ppp/$LOGDEVICE ] && . /etc/ppp/$LOGDEVICE
-[ -f $NETWORKDIR/${NICKNAME} ] && $NETWORKDIR/ifdown-post ${NICKNAME}
+/etc/sysconfig/network-scripts/ifdown-post ifcfg-${LOGDEVICE}
exit 0
diff --git a/ppp/ip-up b/ppp/ip-up
index 4ae2b8c0..3b73814f 100644
--- a/ppp/ip-up
+++ b/ppp/ip-up
@@ -7,12 +7,8 @@ export PATH
LOGDEVICE=$6
REALDEVICE=$1
-NETWORKDIR=/etc/sysconfig/network-scripts
-# get Alias name of device
-[ -f /etc/ppp/$LOGDEVICE ] && . /etc/ppp/$LOGDEVICE
-
-[ -f $NETWORKDIR/${NICKNAME} ] && $NETWORKDIR/ifup-post ${NICKNAME}
+[ -f /etc/sysconfig/network-scripts/ifcfg-${LOGDEVICE} ] && /etc/sysconfig/network-scripts/ifup-post ifcfg-${LOGDEVICE}
[ -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 3c0fd149..a357a117 100755
--- a/sysconfig/network-scripts/ifup-ippp
+++ b/sysconfig/network-scripts/ifup-ippp
@@ -178,7 +178,7 @@ function addprovider()
[ -n "$CBDELAY" ] && log_isdnctrl cbdelay $DEVICE $CBDELAY
[ -n "$CBHUP" ] && log_isdnctrl cbhup $DEVICE $CBHUP
- options="$options ipparam $DEVICE"
+ options="$options ipparam $DEVNAME"
[ "$ENCAP" = "syncppp" ] && log_isdnctrl pppbind $DEVICE
@@ -357,7 +357,4 @@ 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 5b18b318..3d26ebe8 100755
--- a/sysconfig/network-scripts/ifup-ppp
+++ b/sysconfig/network-scripts/ifup-ppp
@@ -141,9 +141,6 @@ 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 \