From 7153146759b6a88d659bff8c2c2234ee1f6da7e3 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sun, 28 Jun 2015 09:18:47 -0700 Subject: [PATCH] Don't ask for script version when WORKAROUNDS=No Signed-off-by: Tom Eastep --- Shorewall-core/lib.common | 5 +++-- Shorewall/manpages/shorewall.conf.xml | 7 +++++++ Shorewall6/manpages/shorewall6.conf.xml | 7 +++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Shorewall-core/lib.common b/Shorewall-core/lib.common index b41bff4e0..e1d29ae64 100644 --- a/Shorewall-core/lib.common +++ b/Shorewall-core/lib.common @@ -98,9 +98,10 @@ get_script_version() { # $1 = script local digits 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" else diff --git a/Shorewall/manpages/shorewall.conf.xml b/Shorewall/manpages/shorewall.conf.xml index d9eee10df..a6896d89d 100644 --- a/Shorewall/manpages/shorewall.conf.xml +++ b/Shorewall/manpages/shorewall.conf.xml @@ -2999,6 +2999,13 @@ INLINE - - - ; -j REJECT are enabled; when WORKAROUNDS=No, they are disabled. If not specified or if specified as empty, WORKAROUNDS=Yes is assumed. + + + Do not set WORKAROUNDS=Yes if you need to be able to use + Shorewall-generated scripts (such as created by the + save command) built by Shorewall 4.4.7 or + older. + diff --git a/Shorewall6/manpages/shorewall6.conf.xml b/Shorewall6/manpages/shorewall6.conf.xml index 4da0d81b1..bd4327850 100644 --- a/Shorewall6/manpages/shorewall6.conf.xml +++ b/Shorewall6/manpages/shorewall6.conf.xml @@ -2648,6 +2648,13 @@ INLINE - - - ; -j REJECT are enabled; when WORKAROUNDS=No, they are disabled. If not specified or if specified as empty, WORKAROUNDS=Yes is assumed. + + + Do not set WORKAROUNDS=Yes if you need to be able to use + Shorewall-generated scripts (such as created by the + save command) built by Shorewall 4.4.7 or + older. +