|
 |
26b15f |
Adapted version of
|
|
|
26b15f |
|
|
|
26b15f |
commit 65801d02a482befd2745c792d6596ec75d434934
|
|
|
26b15f |
Author: Dan Williams <dcbw@redhat.com>
|
|
|
26b15f |
Date: Mon Apr 10 12:35:18 2017 -0500
|
|
|
26b15f |
|
|
|
26b15f |
iptables-restore.8: document -w/-W options
|
|
|
26b15f |
|
|
|
26b15f |
Fixes: 999eaa241212 ("iptables-restore: support acquiring the lock.")
|
|
|
26b15f |
Signed-off-by: Dan Williams <dcbw@redhat.com>
|
|
|
26b15f |
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
26b15f |
|
|
|
26b15f |
diff -up iptables-1.4.21/iptables/iptables-restore.8.in.restore_wait_man iptables-1.4.21/iptables/iptables-restore.8.in
|
|
|
26b15f |
--- iptables-1.4.21/iptables/iptables-restore.8.in.restore_wait_man 2017-04-20 17:33:23.386401192 +0200
|
|
|
26b15f |
+++ iptables-1.4.21/iptables/iptables-restore.8.in 2017-04-20 17:35:13.562713997 +0200
|
|
|
26b15f |
@@ -23,9 +23,11 @@ iptables-restore \(em Restore IP Tables
|
|
|
26b15f |
.P
|
|
|
26b15f |
ip6tables-restore \(em Restore IPv6 Tables
|
|
|
26b15f |
.SH SYNOPSIS
|
|
|
26b15f |
-\fBiptables\-restore\fP [\fB\-chntvV\fP] [\fB\-M\fP \fImodprobe\fP]
|
|
|
26b15f |
+\fBiptables\-restore\fP [\fB\-chntvV\fP] [\fB\-w\fP \fIsecs\fP]
|
|
|
26b15f |
++[\fB\-W\fP \fIusecs\fP] [\fB\-M\fP \fImodprobe\fP]
|
|
|
26b15f |
.P
|
|
|
26b15f |
-\fBip6tables\-restore\fP [\fB\-chntvV\fP] [\fB\-M\fP \fImodprobe\fP]
|
|
|
26b15f |
+\fBip6tables\-restore\fP [\fB\-chntvV\fP] [\fB\-w\fP \fIsecs\fP]
|
|
|
26b15f |
++[\fB\-W\fP \fIusecs\fP] [\fB\-M\fP \fImodprobe\fP]
|
|
|
26b15f |
[\fB\-T\fP \fIname\fP]
|
|
|
26b15f |
.SH DESCRIPTION
|
|
|
26b15f |
.PP
|
|
|
26b15f |
@@ -54,6 +56,21 @@ Print additional debug info during rules
|
|
|
26b15f |
\fB\-V\fP, \fB\-\-version\fP
|
|
|
26b15f |
Print the program version number.
|
|
|
26b15f |
.TP
|
|
|
26b15f |
+\fB\-w\fP, \fB\-\-wait\fP [\fIseconds\fP]
|
|
|
26b15f |
+Wait for the xtables lock.
|
|
|
26b15f |
+To prevent multiple instances of the program from running concurrently,
|
|
|
26b15f |
+an attempt will be made to obtain an exclusive lock at launch. By default,
|
|
|
26b15f |
+the program will exit if the lock cannot be obtained. This option will
|
|
|
26b15f |
+make the program wait (indefinitely or for optional \fIseconds\fP) until
|
|
|
26b15f |
+the exclusive lock can be obtained.
|
|
|
26b15f |
+.TP
|
|
|
26b15f |
+\fB\-W\fP, \fB\-\-wait-interval\fP \fImicroseconds\fP
|
|
|
26b15f |
+Interval to wait per each iteration.
|
|
|
26b15f |
+When running latency sensitive applications, waiting for the xtables lock
|
|
|
26b15f |
+for extended durations may not be acceptable. This option will make each
|
|
|
26b15f |
+iteration take the amount of time specified. The default interval is
|
|
|
26b15f |
+1 second. This option only works with \fB\-w\fP.
|
|
|
26b15f |
+.TP
|
|
|
26b15f |
\fB\-M\fP, \fB\-\-modprobe\fP \fImodprobe_program\fP
|
|
|
26b15f |
Specify the path to the modprobe program. By default, iptables-restore will
|
|
|
26b15f |
inspect /proc/sys/kernel/modprobe to determine the executable's path.
|