diff --git a/Shorewall6/shorewall6 b/Shorewall6/shorewall6 index 368265f0b..15ba4870d 100755 --- a/Shorewall6/shorewall6 +++ b/Shorewall6/shorewall6 @@ -445,11 +445,6 @@ start_command() { FAST=Yes option=${option#f} ;; - p*) - [ -n "$(which conntrack)" ] || fatal_error "The '-p' option requires the conntrack utility which does not appear to be installed on this system" - PURGE=Yes - option=${option%p} - ;; *) usage 1 ;; @@ -1381,11 +1376,11 @@ usage() # $1 = exit status echo " reject
..." echo " reload [ -s ] [ -c ] [ -r ] [ ] " echo " reset [ ... ]" - echo " restart [ -n ] [ -p ] [ -f ] [ ]" + echo " restart [ -n ] [ -f ] [ ]" 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|raw|routing|tc|vardir|zones} ]" - echo " start [ -f ] [ -n ] [ -p ] [ ]" + echo " start [ -f ] [ -n ] [ ]" echo " stop [ -f ]" echo " status" echo " try [ ]" diff --git a/manpages/shorewall.xml b/manpages/shorewall.xml index 749264e74..6c9feff4a 100644 --- a/manpages/shorewall.xml +++ b/manpages/shorewall.xml @@ -683,13 +683,12 @@ -f capabilities > capabilities on a system with Shorewall Lite installed. - The option only works when the compiler is - Shorewall-perl. It causes the compiler to be run under control of - the Perl debugger. + The option causes the compiler to be run + under control of the Perl debugger. - The option only works when the compiler is - Shorewall-perl. It causes the compiler to be profiled via the Perl - command-line option. + The option causes the compiler to be + profiled via the Perl command-line + option. @@ -741,9 +740,9 @@ Shorewall-perl. It causes the compiler to be run under control of the Perl debugger. - The option only works when the compiler is - Shorewall-perl. It causes the compiler to be profiled via the Perl - command-line option. + The option causes the compiler to be + profiled via the Perl command-line + option. @@ -979,24 +978,14 @@ refresh - Shorewall-shell: The rules involving the the black list, ECN - control rules, and traffic shaping are recreated to reflect any - changes made to your configuration files. Existing connections are - untouched. - - Shorewall-perl: All steps performed by - restart are performed by - refresh with the exception that + All steps performed by restart are + performed by refresh with the exception that refresh only recreates the chains specified in the command while restart recreates the entire Netfilter ruleset. If no chain is given, the static blacklisting chain blacklst is assumed. - Note: Specifying chains in - the command requires Shorewall-perl 4.0.3 or later. Earlier versions - only refresh the blacklst chain - The listed chains are assumed to be in the filter table. You can refresh chains in other tables by prefixing the chain name with the table name followed by ":" (e.g., nat:net_dnat). Chain names diff --git a/manpages6/shorewall6.xml b/manpages6/shorewall6.xml index e1b3b539e..c93293117 100644 --- a/manpages6/shorewall6.xml +++ b/manpages6/shorewall6.xml @@ -71,8 +71,6 @@ - - directory pathname @@ -298,8 +296,6 @@ - - directory @@ -330,8 +326,6 @@ - - directory @@ -346,8 +340,6 @@ - - directory @@ -905,10 +897,6 @@ 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 suppresses the compilation step and simply reused the compiled script which last started/restarted Shorewall6. @@ -1146,10 +1134,6 @@ 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.