Don't ask for script version when WORKAROUNDS=No

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2015-06-28 09:18:47 -07:00
parent a911ec318e
commit 7153146759
3 changed files with 17 additions and 2 deletions

View File

@ -98,9 +98,10 @@ get_script_version() { # $1 = script
local digits local digits
local verbosity local verbosity
if [ "$g_compiled" = "$g_file" ]; then if [ -z "$WORKAROUNDS" -o "$g_compiled" = "$g_file" ]; then
# #
# Either this script was just compiled or AUTOMAKE determined that compilation wasn't needed # Unless WORKAROUNDS=No, either this script was just compiled or AUTOMAKE
# determined that re-compilation wasn't needed
# #
temp="$SHOREWALL_VERSION" temp="$SHOREWALL_VERSION"
else else

View File

@ -2999,6 +2999,13 @@ INLINE - - - ; -j REJECT
are enabled; when WORKAROUNDS=No, they are disabled. If not are enabled; when WORKAROUNDS=No, they are disabled. If not
specified or if specified as empty, WORKAROUNDS=Yes is specified or if specified as empty, WORKAROUNDS=Yes is
assumed.</para> assumed.</para>
<warning>
<para>Do not set WORKAROUNDS=Yes if you need to be able to use
Shorewall-generated scripts (such as created by the
<command>save</command> command) built by Shorewall 4.4.7 or
older.</para>
</warning>
</listitem> </listitem>
</varlistentry> </varlistentry>

View File

@ -2648,6 +2648,13 @@ INLINE - - - ; -j REJECT
are enabled; when WORKAROUNDS=No, they are disabled. If not are enabled; when WORKAROUNDS=No, they are disabled. If not
specified or if specified as empty, WORKAROUNDS=Yes is specified or if specified as empty, WORKAROUNDS=Yes is
assumed.</para> assumed.</para>
<warning>
<para>Do not set WORKAROUNDS=Yes if you need to be able to use
Shorewall-generated scripts (such as created by the
<command>save</command> command) built by Shorewall 4.4.7 or
older.</para>
</warning>
</listitem> </listitem>
</varlistentry> </varlistentry>