From 4a0372809266af6f8bedc1a364b4fa4453638922 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sun, 10 Dec 2006 04:31:00 +0000
Subject: [PATCH] Resolve SHOREWALL_DIR

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5081 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/lib.config | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Shorewall/lib.config b/Shorewall/lib.config
index dfe2f83be..6df14d733 100644
--- a/Shorewall/lib.config
+++ b/Shorewall/lib.config
@@ -1852,7 +1852,10 @@ do_initialize() {
 
     [ -f $VERSION_FILE ] && VERSION=$(cat $VERSION_FILE)
 
-    [ -n "$SHOREWALL_DIR" ] && CONFIG_PATH=$SHOREWALL_DIR:$CONFIG_PATH
+    if [ -n "$SHOREWALL_DIR" ]; then
+	SHOREWALL_DIR=(resolve_file $SHOREWALL_DIR)
+	CONFIG_PATH=$SHOREWALL_DIR:$CONFIG_PATH
+    fi
 
     run_user_exit params