forked from extern/shorewall_code
Fix for CONFIG_PATH
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5077 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
af13f4d4c1
commit
cc3606546a
@ -189,6 +189,7 @@ expand_line() {
|
||||
echo $(expand $line)
|
||||
done
|
||||
}
|
||||
|
||||
#
|
||||
# Add whitespace after leading "!"
|
||||
#
|
||||
@ -1712,6 +1713,7 @@ added_param_value_no() # $1 = Parameter Name, $2 = Parameter value
|
||||
#
|
||||
do_initialize() {
|
||||
|
||||
local config_path=$CONFIG_PATH
|
||||
# Run all utility programs using the C locale
|
||||
#
|
||||
# Thanks to Vincent Planchenault for this tip #
|
||||
@ -1879,6 +1881,8 @@ do_initialize() {
|
||||
|
||||
[ -n "${MODULE_SUFFIX:=o gz ko o.gz ko.gz}" ]
|
||||
|
||||
[ -n "$config_path" ] && CONFIG_PATH=$config_path
|
||||
|
||||
if [ -z "$EXPORT" -a "$(whoami)" = root ]; then
|
||||
|
||||
load_kernel_modules
|
||||
|
Loading…
Reference in New Issue
Block a user