From 9b662456bb416676232c35de2293509e31a33aca Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 11 Feb 2003 02:34:18 +0000 Subject: fix nicknames with profiles (#82246) - source 'network' file in ifdown, so we get the current profile - change need_config to look in the various profile directories - pass device to usernetctl, as that's what's linked where usernetctl looks --- sysconfig/network-scripts/network-functions | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'sysconfig/network-scripts/network-functions') diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index d3cf86ef..d6deb549 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -9,9 +9,14 @@ export PATH need_config () { - [ -f "${CONFIG}" ] || CONFIG=../networking/default/${1} - [ -f "${CONFIG}" ] || CONFIG=../networking/default/ifcfg-${1} - [ -f "${CONFIG}" ] || CONFIG="ifcfg-${1}" + 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}" + [ -f "${CONFIG}" ] && return || CONFIG="${1}" } source_config () -- cgit