Move reading of params file

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5079 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-12-10 04:22:00 +00:00
parent 0890e12446
commit a2bdbafecd

View File

@ -1852,6 +1852,8 @@ do_initialize() {
[ -f $VERSION_FILE ] && VERSION=$(cat $VERSION_FILE) [ -f $VERSION_FILE ] && VERSION=$(cat $VERSION_FILE)
[ -n "$SHOREWALL_DIR" ] && CONFIG_PATH=$SHOREWALL_DIR:$CONFIG_PATH
run_user_exit params run_user_exit params
config=$(find_file shorewall.conf) config=$(find_file shorewall.conf)
@ -1880,8 +1882,6 @@ do_initialize() {
[ -n "${MODULE_SUFFIX:=o gz ko o.gz ko.gz}" ] [ -n "${MODULE_SUFFIX:=o gz ko o.gz ko.gz}" ]
[ -n "$SHOREWALL_DIR" ] && CONFIG_PATH=$SHOREWALL_DIR:$CONFIG_PATH
if [ -z "$EXPORT" -a "$(whoami)" = root ]; then if [ -z "$EXPORT" -a "$(whoami)" = root ]; then
load_kernel_modules load_kernel_modules