From e956fb172d00dc564cc50f2a33a0feb9ddd53839 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 28 May 2003 18:53:50 +0000 Subject: - make usernetctl use the nickname instead of the device name - don't look in /etc/sysconfig/networking - fix calling of nameif before the device was loaded - clean up route handling () --- sysconfig/network-scripts/network-functions | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'sysconfig/network-scripts/network-functions') diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index d6deb549..d8c03a6e 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -9,13 +9,7 @@ export PATH need_config () { - CURRENT_PROFILE=${CURRENT_PROFILE:-default} - CURRENT_PROFILE=${CURRENT_PROFILE##*/} - CONFIG=../networking/profiles/$CURRENT_PROFILE/ifcfg-${1} - [ -f "${CONFIG}" ] && return || CONFIG=../networking/profiles/$CURRENT_PROFILE/${1} - [ -f "${CONFIG}" ] && return || CONFIG=../networking/default/ifcfg-${1} - [ -f "${CONFIG}" ] && return || CONFIG=../networking/default/${1} - [ -f "${CONFIG}" ] && return || CONFIG="ifcfg-${1}" + CONFIG="ifcfg-${1}" [ -f "${CONFIG}" ] && return || CONFIG="${1}" } @@ -93,6 +87,7 @@ is_available () return 2 fi modprobe $1 > /dev/null 2>&1 || return 1 + LC_ALL= LANG= ip -o link | grep -q $1 return $? } -- cgit