Use correct shell in 'shorewall try'

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

Shorewall/changelog.txt

@@ -6,6 +6,8 @@ Changes in 3.2.0 RC 5
 
 3)  Avoid problem with ash.
 
+4)  Make the 'try' command use the correct SHOREWALL_SHELL.
+
 -------------------------------------------------------------------------------
 Changes in 3.2.0 RC 4
 

Shorewall/releasenotes.txt

@@ -46,6 +46,18 @@ Problems Corrected in 3.2.0 RC 5
 3)  Some versions of 'ash' generate an error message when a log level is
     included in a rule.
 
+4)  Shorewall would use the incorrect shell for compilation in the
+    following case:
+
+    a) /etc/shorewall/shorewall.conf specified
+    SHOREWALL_SHELL=/bin/shell1.
+
+    b) /foo/bar/shorewall.conf specified SHOREWALL_SHELL=/bin/shell2.
+
+    c) The command "shorewall try /foo/bar" was executed. Compilation
+    of the configuration in /foo/bar would be done using /bin/shell2
+    rather than /bin/shell1.
+
 Other changes in 3.2.0 RC 5
 
 None.

Shorewall/shorewall

@@ -1762,6 +1762,7 @@ case "$COMMAND" in
 	[ $# -lt 2 -o $# -gt 3 ] && usage 1
 	VERBOSE=$(make_verbose)
 	[ -n "$NOROUTES" ] && NOROUTES=-n
+	export -n CONFIG_PATH
 	if ! $0 $debugging $VERBOSE -c $2 restart; then
 	    if ! $IPTABLES -L shorewall > /dev/null 2> /dev/null; then
 		$0 $VERBOSE $NOROUTES start