From a2bdbafecd5fae122d15adee9c4e8b3944b7ba7a Mon Sep 17 00:00:00 2001 From: teastep Date: Sun, 10 Dec 2006 04:22:00 +0000 Subject: [PATCH] Move reading of params file git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5079 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall/lib.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Shorewall/lib.config b/Shorewall/lib.config index 39097e20c..9dc892fc3 100644 --- a/Shorewall/lib.config +++ b/Shorewall/lib.config @@ -1852,6 +1852,8 @@ do_initialize() { [ -f $VERSION_FILE ] && VERSION=$(cat $VERSION_FILE) + [ -n "$SHOREWALL_DIR" ] && CONFIG_PATH=$SHOREWALL_DIR:$CONFIG_PATH + run_user_exit params config=$(find_file shorewall.conf) @@ -1880,8 +1882,6 @@ do_initialize() { [ -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 load_kernel_modules