Final (I hope) version of PG Patch #2

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4123 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb

Shorewall/compiler

@@ -8639,7 +8639,7 @@ do_initialize() {
 
     SHAREDIR=/usr/share/shorewall
     VARDIR=/var/lib/shorewall
-    CONFDIR=/etc/shorewall
+    [ -z "$EXPORT" ] && CONFDIR=/etc/shorewall || CONFDIR=/usr/share/shorewall/configfiles
 
     FUNCTIONS=${SHAREDIR}/functions
 

Shorewall/configpath

@@ -4,4 +4,4 @@
 # /usr/share/shorewall/configpath
 #
 
-CONFIG_PATH=/etc/shorewall:/usr/share/shorewall
+CONFIG_PATH=${CONFDIR}:/usr/share/shorewall

Shorewall/functions

@@ -248,7 +248,7 @@ find_file()
 
 		IFS=$saveifs
 
-		[ -z "$EXPORT" ] && echo ${CONFDIR}/$1 || echo ${SHAREDIR}/configfiles/$1
+		echo ${CONFDIR}/$1
 	    fi
 	    ;;
     esac

Shorewall/shorewall

@@ -194,6 +194,8 @@ get_config() {
 
     if [ -z "$EXPORT" -a "$(whoami)" = root ]; then
 
+	export CONFIG_PATH
+	
 	[ -z "$LOGFILE" ] && LOGFILE=/var/log/messages
 
 	if [ ! -f $LOGFILE ]; then
@@ -1557,7 +1559,6 @@ else
 fi
 
 ensure_config_path
-export CONFIG_PATH
 
 get_config