From fd6ce5263aff225655ac71d7db39124bd70e92cb Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sun, 10 Dec 2006 16:06:11 +0000
Subject: [PATCH] Another tweak to SHOREWALL_DIR handling

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5084 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/lib.base   | 4 ++++
 Shorewall/lib.config | 9 ++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Shorewall/lib.base b/Shorewall/lib.base
index 7bc916b40..73448a77e 100644
--- a/Shorewall/lib.base
+++ b/Shorewall/lib.base
@@ -832,6 +832,10 @@ ensure_config_path() {
 	[ -f $F ] || { echo "   ERROR: $F does not exist"; exit 2; }
 	. $F
     fi
+
+    if [ -n "$SHOREWALL_DIR" ]; then
+	[ "${CONFIG_PATH%%:*}" = "$SHOREWALL_DIR" ] || CONFIG_PATH=$SHOREWALL_DIR:$CONFIG_PATH
+    fi
 }
 
 #
diff --git a/Shorewall/lib.config b/Shorewall/lib.config
index 6bf335c35..2e417d351 100644
--- a/Shorewall/lib.config
+++ b/Shorewall/lib.config
@@ -1846,17 +1846,14 @@ do_initialize() {
 	    ;;
     esac
 
+    [ -n "$SHOREWALL_DIR" ] && SHOREWALL_DIR=$(resolve_file $SHOREWALL_DIR)
+
     ensure_config_path
 
     VERSION_FILE=$SHAREDIR/version
 
     [ -f $VERSION_FILE ] && VERSION=$(cat $VERSION_FILE)
 
-    if [ -n "$SHOREWALL_DIR" ]; then
-	SHOREWALL_DIR=$(resolve_file $SHOREWALL_DIR)
-	CONFIG_PATH=$SHOREWALL_DIR:$CONFIG_PATH
-    fi
-
     run_user_exit params
 
     config=$(find_file shorewall.conf)
@@ -1885,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