diff options
| author | Bill Nottingham <notting@redhat.com> | 2009-03-16 16:02:19 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2009-03-16 16:02:19 -0400 |
| commit | a125e0a1fe8488c4f0e0bebb894df798bd98fce8 (patch) | |
| tree | 69a75cd23ced78bb605475c392a0c9a55f95f9bf | |
| parent | 750074d873466dc2cdd6bbfaa79ce22c4e001ebe (diff) | |
| download | initscripts-a125e0a1fe8488c4f0e0bebb894df798bd98fce8.tar initscripts-a125e0a1fe8488c4f0e0bebb894df798bd98fce8.tar.gz initscripts-a125e0a1fe8488c4f0e0bebb894df798bd98fce8.tar.bz2 initscripts-a125e0a1fe8488c4f0e0bebb894df798bd98fce8.tar.xz initscripts-a125e0a1fe8488c4f0e0bebb894df798bd98fce8.zip | |
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.
| -rwxr-xr-x | sysconfig/network-scripts/ifup-ppp | 3 | ||||
| -rw-r--r-- | sysconfig/network-scripts/network-functions | 10 |
2 files changed, 0 insertions, 13 deletions
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 @@ -71,9 +71,6 @@ 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" /usr/bin/logger -p daemon.info -t ifup-ppp \ 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 |