holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Ignore AUTOMAKE setting when a <directory> is given to start/restart

Browse Source 
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
This commit is contained in:
teastep 2009-04-02 14:24:23 +00:00
parent d950fa27f2
commit 180925173b
5 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Shorewall/releasenotes.txt
View File

@ -105,6 +105,10 @@ None.
script used during the last 'start' or 'restart' is used to script used during the last 'start' or 'restart' is used to
start/restart the firewall. 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 Note that the 'make' utility must be installed on the firewall
system in order for AUTOMAKE=Yes to work correctly. system in order for AUTOMAKE=Yes to work correctly.

2
Shorewall/shorewall
View File

@ -491,6 +491,7 @@ start_command() {
SHOREWALL_DIR=$(resolve_file $1) SHOREWALL_DIR=$(resolve_file $1)
export SHOREWALL_DIR export SHOREWALL_DIR
AUTOMAKE=
;; ;;
*) *)
usage 1 usage 1
@ -785,6 +786,7 @@ restart_command() {
SHOREWALL_DIR=$(resolve_file $1) SHOREWALL_DIR=$(resolve_file $1)
[ -n "$FAST" ] && fatal_error "Directory may not be specified with the -f option" [ -n "$FAST" ] && fatal_error "Directory may not be specified with the -f option"
export SHOREWALL_DIR export SHOREWALL_DIR
AUTOMAKE=
;; ;;
*) *)
usage 1 usage 1

2
Shorewall6/shorewall6
View File

@ -479,6 +479,7 @@ start_command() {
SHOREWALL_DIR=$(resolve_file $1) SHOREWALL_DIR=$(resolve_file $1)
export SHOREWALL_DIR export SHOREWALL_DIR
AUTOMAKE=
;; ;;
*) *)
usage 1 usage 1
@ -761,6 +762,7 @@ restart_command() {
SHOREWALL_DIR=$(resolve_file $1) SHOREWALL_DIR=$(resolve_file $1)
[ -n "$FAST" ] && fatal_error "Directory may not be specified with the -f option" [ -n "$FAST" ] && fatal_error "Directory may not be specified with the -f option"
export SHOREWALL_DIR export SHOREWALL_DIR
AUTOMAKE=
;; ;;
*) *)
usage 1 usage 1

5
manpages/shorewall.conf.xml
View File

@ -252,6 +252,11 @@
invoked, the behavior is as if the first line of the macro file was 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 "COMMENT &lt;macro name&gt;". The AUTO_COMMENT option has a default
value of 'Yes'.</para> 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> </listitem>
</varlistentry> </varlistentry>

5
manpages6/shorewall6.conf.xml
View File

@ -217,6 +217,11 @@
skipped and the compiled script that executed the last skipped and the compiled script that executed the last
<command>start</command> or <command>restart</command> command is <command>start</command> or <command>restart</command> command is
used. The default is AUTOMAKE=No.</para> 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> </listitem>
</varlistentry> </varlistentry>