From 180925173b0c2366eaaf11eb9dba8d1b8b0a2afa Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Thu, 2 Apr 2009 14:24:23 +0000
Subject: [PATCH] Ignore AUTOMAKE setting when a <directory> is given to
 start/restart

Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9782 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/releasenotes.txt    | 4 ++++
 Shorewall/shorewall           | 2 ++
 Shorewall6/shorewall6         | 2 ++
 manpages/shorewall.conf.xml   | 5 +++++
 manpages6/shorewall6.conf.xml | 5 +++++
 5 files changed, 18 insertions(+)

diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index c94df971f..5cf375f63 100644
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -105,6 +105,10 @@ None.
     script used during the last 'start' or 'restart' is used to
     start/restart the firewall.
 
+    Note that if a <directory> is specified in the start/restart
+    command (e.g., "shorewall restart /etc/shorewall.new") then the
+    setting of AUTOMAKE is ignored.
+
     Note that the 'make' utility must be installed on the firewall
     system in order for AUTOMAKE=Yes to work correctly.
 
diff --git a/Shorewall/shorewall b/Shorewall/shorewall
index 030032a80..b294bee46 100755
--- a/Shorewall/shorewall
+++ b/Shorewall/shorewall
@@ -491,6 +491,7 @@ start_command() {
 
 	    SHOREWALL_DIR=$(resolve_file $1)
 	    export SHOREWALL_DIR
+	    AUTOMAKE=
 	    ;;
 	*)
 	    usage 1
@@ -785,6 +786,7 @@ restart_command() {
 	    SHOREWALL_DIR=$(resolve_file $1)
 	    [ -n "$FAST" ] && fatal_error "Directory may not be specified with the -f option"
 	    export SHOREWALL_DIR
+	    AUTOMAKE=
 	    ;;
 	*)
 	    usage 1
diff --git a/Shorewall6/shorewall6 b/Shorewall6/shorewall6
index 4bfc4bfb2..63f3cf763 100755
--- a/Shorewall6/shorewall6
+++ b/Shorewall6/shorewall6
@@ -479,6 +479,7 @@ start_command() {
 
 	    SHOREWALL_DIR=$(resolve_file $1)
 	    export SHOREWALL_DIR
+	    AUTOMAKE=
 	    ;;
 	*)
 	    usage 1
@@ -761,6 +762,7 @@ restart_command() {
 	    SHOREWALL_DIR=$(resolve_file $1)
 	    [ -n "$FAST" ] && fatal_error "Directory may not be specified with the -f option"
 	    export SHOREWALL_DIR
+	    AUTOMAKE=
 	    ;;
 	*)
 	    usage 1
diff --git a/manpages/shorewall.conf.xml b/manpages/shorewall.conf.xml
index f92be519e..ce9e5247d 100644
--- a/manpages/shorewall.conf.xml
+++ b/manpages/shorewall.conf.xml
@@ -252,6 +252,11 @@
           invoked, the behavior is as if the first line of the macro file was
           "COMMENT &lt;macro name&gt;". The AUTO_COMMENT option has a default
           value of 'Yes'.</para>
+
+          <para>The setting of the AUTOMAKE option is ignored if the
+          <command>start</command> or <command>restart</command> command
+          includes a directory name (e.g.,<command> shorewall restart
+          /etc/shorewall.new</command>).</para>
         </listitem>
       </varlistentry>
 
diff --git a/manpages6/shorewall6.conf.xml b/manpages6/shorewall6.conf.xml
index 6d9dc29b5..27b4c1a9d 100644
--- a/manpages6/shorewall6.conf.xml
+++ b/manpages6/shorewall6.conf.xml
@@ -217,6 +217,11 @@
           skipped and the compiled script that executed the last
           <command>start</command> or <command>restart</command> command is
           used. The default is AUTOMAKE=No.</para>
+
+          <para>The setting of the AUTOMAKE option is ignored if the
+          <command>start</command> or <command>restart</command> command
+          includes a directory name (e.g.,<command> shorewall6 restart
+          /etc/shorewall.new</command>).</para>
         </listitem>
       </varlistentry>