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)

---
 sysconfig/network-scripts/ifup-ippp | 5 +----
 sysconfig/network-scripts/ifup-ppp  | 3 ---
 2 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'sysconfig/network-scripts')

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