aboutsummaryrefslogtreecommitdiffstats
path: root/sysconfig/network-scripts/network-functions
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2003-05-28 18:53:50 +0000
committerBill Nottingham <notting@redhat.com>2003-05-28 18:53:50 +0000
commite956fb172d00dc564cc50f2a33a0feb9ddd53839 (patch)
tree8316038834ff51a4d745dd867b4535ca94ea94b5 /sysconfig/network-scripts/network-functions
parent515094b273406277de12adc648846435e27ce389 (diff)
downloadinitscripts-e956fb172d00dc564cc50f2a33a0feb9ddd53839.tar
initscripts-e956fb172d00dc564cc50f2a33a0feb9ddd53839.tar.gz
initscripts-e956fb172d00dc564cc50f2a33a0feb9ddd53839.tar.bz2
initscripts-e956fb172d00dc564cc50f2a33a0feb9ddd53839.tar.xz
initscripts-e956fb172d00dc564cc50f2a33a0feb9ddd53839.zip
- 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 (<harald@redhat.com>)
Diffstat (limited to 'sysconfig/network-scripts/network-functions')
-rw-r--r--sysconfig/network-scripts/network-functions9
1 files changed, 2 insertions, 7 deletions
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 $?
}