diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index 9dfc9c02d..a9a19f51e 100644 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -4,6 +4,8 @@ Changes in Shorewall 4.4.20 Beta 4 2) Implement LEGACY_FASTSTART option. +3) Add a '-c' option to the restart command. + Changes in Shorewall 4.4.20 Beta 3 1) Add auditing support. diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index a1f2678d7..ec0c7deb3 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -147,6 +147,14 @@ VI. PROBLEMS CORRECTED AND NEW FEATURES IN PRIOR RELEASES LEGACY_FASTSTART=No, 'start -f' and 'restart -f' compare with /var/lib/shorewall[6]/firewall. +7) A '-c' (compile) option has been added to the 'restart' + command in both Shorewall and Shorewall6. It overrides the setting + of AUTOMAKE and unconditionally forces a recompilation of the + configuration. + + When both -c and -f are specified, the result is determined by the + option that appears last. + ---------------------------------------------------------------------------- I V. R E L E A S E 4 . 4 H I G H L I G H T S ---------------------------------------------------------------------------- diff --git a/Shorewall/shorewall b/Shorewall/shorewall index 442607f30..5e28f342f 100755 --- a/Shorewall/shorewall +++ b/Shorewall/shorewall @@ -724,6 +724,10 @@ restart_command() { g_fast=Yes option=${option#f} ;; + c*) + AUTOMAKE= + option=${option#c} + ;; n*) g_noroutes=Yes option=${option#n} @@ -1385,7 +1389,7 @@ usage() # $1 = exit status echo " reject
..." echo " reload [ -s ] [ -c ] [ -r ] [ ] " echo " reset [ ... ]" - echo " restart [ -n ] [ -p ] [ -f ] [ ]" + echo " restart [ -n ] [ -p ] [-d] [ -f ] [ -c ][ ]" echo " restore [ -n ] [ ]" echo " save [ ]" echo " show [ -x ] [ -t {filter|mangle|nat} ] [ {chain [ [ ... ]" diff --git a/Shorewall6/shorewall6 b/Shorewall6/shorewall6 index d0d763551..3e14cb701 100755 --- a/Shorewall6/shorewall6 +++ b/Shorewall6/shorewall6 @@ -651,6 +651,10 @@ restart_command() { g_fast=Yes option=${option#f} ;; + c*) + AUTOMAKE= + option=${option#c} + ;; n*) g_noroutes=Yes option=${option#n} @@ -1310,7 +1314,7 @@ usage() # $1 = exit status echo " reject
..." echo " reload [ -s ] [ -c ] [ -r ] [ ] " echo " reset [ ... ]" - echo " restart [ -n ] [ -f ] [ ]" + echo " restart [ -n ] [ -p ] [-d] [ -f ] [ -c ][ ]" echo " restore [ -n ] [ ]" echo " save [ ]" echo " show [ -x ] [ -m ] [-f] [ -t {filter|mangle} ] [ {chain [ [ ... ]|actions|capabilities|classifiers|config|connections|filters|ip|log []|macros|mangle|nat|policies|raw|routing|tc|vardir|zones} ]" diff --git a/manpages/shorewall.xml b/manpages/shorewall.xml index 9da2939e7..d40fe2748 100644 --- a/manpages/shorewall.xml +++ b/manpages/shorewall.xml @@ -377,10 +377,12 @@ - + + + directory @@ -1114,9 +1116,18 @@ table to be flushed; the conntrack utility must be installed to use this option. + The option causes the compiler to run + under the Perl debugger. + The option suppresses the compilation step and simply reused the compiled script which last started/restarted - Shorewall. + Shorewall, provided that /etc/shorewall and its contents have not + been modified since the last start/restart. + + The option was added in Shorewall 4.4.20 + and performs the compilation step unconditionally, overriding the + AUTOMAKE setting in shorewall.conf(5). diff --git a/manpages6/shorewall6.xml b/manpages6/shorewall6.xml index 71d6ab92d..72f0b51ae 100644 --- a/manpages6/shorewall6.xml +++ b/manpages6/shorewall6.xml @@ -922,9 +922,24 @@ The option causes Shorewall6 to avoid updating the routing table(s). + The option causes the connection tracking + table to be flushed; the conntrack utility must + be installed to use this option. + + The option causes the compiler to run + under the Perl debugger. + The option suppresses the compilation step and simply reused the compiled script which last started/restarted - Shorewall6. + Shorewall, provided that /etc/shorewall6 and its contents have not + been modified since the last start/restart. + + The option was added in Shorewall 4.4.20 + and performs the compilation step unconditionally, overriding the + AUTOMAKE setting in shorewall6.conf(5). When both + and are present, the result + is determined by the option that appears last.