From 5c89279af3fc40579b837549a75c8dce9345e02d Mon Sep 17 00:00:00 2001
From: Than Ngo <than@redhat.com>
Date: Wed, 22 Oct 2003 16:45:39 +0000
Subject: add better fix to support nickname (#105785)

---
 ChangeLog                           | 5 +++++
 ppp/ip-down                         | 5 +----
 ppp/ip-up                           | 6 +-----
 sysconfig/network-scripts/ifup-ippp | 5 +----
 sysconfig/network-scripts/ifup-ppp  | 3 ---
 5 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 62198e29..636da15b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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:
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 \
-- 
cgit v1.2.1