From a125e0a1fe8488c4f0e0bebb894df798bd98fce8 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Mon, 16 Mar 2009 16:02:19 -0400
Subject: Remove support for 'ifcfg-foo-bar' configurations that automatically
 inherit from 'ifcfg-foo'.

1) I'm not sure of anything at all that ever supported this except for manual configuration.
2) '-' is a valid character in ethernet device names. So you can't have 'ifcfg-eth0-2' files that work.
3) Having it work for every '-' separated combination, except those that end in 'g' is just strange.
---
 sysconfig/network-scripts/ifup-ppp          |  3 ---
 sysconfig/network-scripts/network-functions | 10 ----------
 2 files changed, 13 deletions(-)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifup-ppp b/sysconfig/network-scripts/ifup-ppp
index 3f8ea620..3d8be0f5 100755
--- a/sysconfig/network-scripts/ifup-ppp
+++ b/sysconfig/network-scripts/ifup-ppp
@@ -70,9 +70,6 @@ fi
 if [ ! -f ${PEERCONF} ]; then
   if [ -z "${WVDIALSECT}" ] ; then
     CHATSCRIPT=/etc/sysconfig/network-scripts/chat-${DEVNAME}
-    [ -f ${CHATSCRIPT} ] || {
-      CHATSCRIPT=/etc/sysconfig/network-scripts/chat-${PARENTDEVNAME}
-    }
     [ -f ${CHATSCRIPT} ] || {
      echo $"/etc/sysconfig/network-scripts/chat-${DEVNAME} does not exist"
      echo $"ifup-ppp for ${DEVNAME} exiting"
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index 7c0dff8e..8c720598 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -67,16 +67,6 @@ need_config ()
 source_config ()
 {
     DEVNAME=`basename $CONFIG | sed 's/^ifcfg-//g'`
-    if echo ${CONFIG##*/} | grep -q '[^g]-' ; then
-	PARENTCONFIG=`echo $CONFIG | sed 's/-[^-]*$//g'`
-	PARENTDEVNAME=${PARENTCONFIG##*/ifcfg-}
-	[ -f $PARENTCONFIG ] || {
-	    echo $"Missing config file $PARENTCONFIG." >&2
-	    exit 1
-	}
-	. ./$PARENTCONFIG
-	[ -r "keys-$PARENTDEVNAME" ] && . ./keys-$PARENTDEVNAME
-    fi
     . ./$CONFIG
     [ -r "keys-$DEVNAME" ] && . ./keys-$DEVNAME
     case "$TYPE" in
-- 
cgit v1.2.1