From d0aac9ff2e79fb5c08a022ddb8d89f1bbee07d3a Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sun, 8 Jul 2007 17:10:42 +0000
Subject: [PATCH] Add undocumented /etc/shorewall/vardir file

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6808 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-perl/Shorewall/Compiler.pm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Shorewall-perl/Shorewall/Compiler.pm b/Shorewall-perl/Shorewall/Compiler.pm
index c076a3c23..fff3dfa6e 100644
--- a/Shorewall-perl/Shorewall/Compiler.pm
+++ b/Shorewall-perl/Shorewall/Compiler.pm
@@ -113,21 +113,23 @@ sub generate_script_1() {
     if ( $export ) {
 	emitj ( 'SHAREDIR=/usr/share/shorewall-lite',
 		'CONFDIR=/etc/shorewall-lite',
-		'VARDIR=/var/lib/shorewall-lite',
 		'PRODUCT="Shorewall Lite"'
 		);
     } else {
 	emitj ( 'SHAREDIR=/usr/share/shorewall',
 		'CONFDIR=/etc/shorewall',
-		'VARDIR=/var/lib/shorewall',
 		'PRODUCT=\'Shorewall\'',
 		);
     }
 
+    emit( '[ -f ${CONFDIR}/vardir ] && . ${CONFDIR}/vardir' );
+
     if ( $export ) {
-	emit ( 'CONFIG_PATH="/etc/shorewall-lite:/usr/share/shorewall-lite"' );
+	emitj ( 'CONFIG_PATH="/etc/shorewall-lite:/usr/share/shorewall-lite"' ,
+		'[ -n "${VARDIR:=/var/lib/shorewall-lite}" ]' );
     } else {
-	emit ( qq(CONFIG_PATH="$config{CONFIG_PATH}") );
+	emitj ( qq(CONFIG_PATH="$config{CONFIG_PATH}") ,
+		'[ -n "${VARDIR:=/var/lib/shorewall}" ]' );
     }
 
     emit 'TEMPFILE=';
@@ -162,7 +164,6 @@ sub generate_script_1() {
 
     emitj ( '',
 	    "STOPPING=",
-	    'COMMENT=',        # Maintain compability with lib.base
 	    '',
 	    '#',
 	    '# The library requires that ${VARDIR} exist',