diff options
| author | Jiri Popelka <jpopelka@redhat.com> | 2014-07-04 15:50:41 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-07-25 19:10:47 +0200 |
| commit | aaa4ace72ba1d195bbf436134a336816c33f7bd0 (patch) | |
| tree | 523040baa49a3479bf7bc775bb375b0b692dd288 /iptables/iptables.8.in | |
| parent | 03a3f7cf1826f70dd1db070aa8ee11bd2abbccd9 (diff) | |
iptables: add optional [seconds] argument to -w
This patch adds an optional numeric argument
to -w option (added with 93587a0) so one can
specify how long to wait for an exclusive lock.
If the value isn't specified it works as before,
i.e. program waits indefinitely.
If user specifies it, program exits after
the given time interval passes.
This patch also adds the -w/--wait to nftables
compat code, so the parser doesn't complain.
[ In the original patch, iptables-compat -w X was not working,
I have fixed by adding the dummy code not to break scripts
using the new optional argument --pablo ]
Signed-off-by: Jiri Popelka <jpopelka@redhat.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'iptables/iptables.8.in')
| -rw-r--r-- | iptables/iptables.8.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/iptables/iptables.8.in b/iptables/iptables.8.in index 8ef222e5..ceba5dc2 100644 --- a/iptables/iptables.8.in +++ b/iptables/iptables.8.in @@ -359,12 +359,13 @@ For appending, insertion, deletion and replacement, this causes detailed information on the rule or rules to be printed. \fB\-v\fP may be specified multiple times to possibly emit more detailed debug statements. .TP -\fB\-w\fP, \fB\-\-wait\fP +\fB\-w\fP, \fB\-\-wait\fP [\fIseconds\fP] Wait for the xtables lock. To prevent multiple instances of the program from running concurrently, an attempt will be made to obtain an exclusive lock at launch. By default, the program will exit if the lock cannot be obtained. This option will -make the program wait until the exclusive lock can be obtained. +make the program wait (indefinitely or for optional \fIseconds\fP) until +the exclusive lock can be obtained. .TP \fB\-n\fP, \fB\-\-numeric\fP Numeric output. |