From fd63008e5c0136b65283fe306bd00c835d057c24 Mon Sep 17 00:00:00 2001
From: Florian La Roche <laroche@redhat.com>
Date: Sun, 31 Oct 2004 20:08:15 +0000
Subject: - some optims/cleanups, details in initscripts.spec

---
 sysconfig/network-scripts/ifup-ppp          | 2 +-
 sysconfig/network-scripts/network-functions | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'sysconfig/network-scripts')

diff --git a/sysconfig/network-scripts/ifup-ppp b/sysconfig/network-scripts/ifup-ppp
index 3d26ebe8..2e7e8184 100755
--- a/sysconfig/network-scripts/ifup-ppp
+++ b/sysconfig/network-scripts/ifup-ppp
@@ -11,7 +11,7 @@ if [ "${1}" = daemon ] ; then
   shift
 else
   # just in case a full path to the configuration file is passed in
-  CONFIG=$(basename $1)
+  CONFIG=${1##*/} # CONFIG=$(basename $1)
   [ -f "${CONFIG}" ] || CONFIG=ifcfg-${1}
   source_config
   # don't start ppp-watch by xDSL
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index 249978a6..5b9429d2 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -32,11 +32,10 @@ need_config ()
 
 source_config ()
 {
-    DEVNAME=`basename $CONFIG | sed 's/^ifcfg-//g'`
-
-    if basename $CONFIG | grep -q '[^g]-' ; then
+    DEVNAME=${CONFIG##*/ifcfg-} #DEVNAME=`basename $CONFIG | sed 's/^ifcfg-//g'`
+    if echo ${CONFIG##*/} | grep -q '[^g]-' ; then
 	PARENTCONFIG=`echo $CONFIG | sed 's/-[^-]*$//g'`
-	PARENTDEVNAME=`basename $PARENTCONFIG | sed 's/^ifcfg-//g'`
+	PARENTDEVNAME=${PARENTCONFIG##*/ifcfg-}
 	[ -f $PARENTCONFIG ] || {
 	    echo $"Missing config file $PARENTCONFIG." >&2
 	    exit 1
-- 
cgit v1.2.1