summaryrefslogtreecommitdiffstats
path: root/sys-utils/flock.1
diff options
context:
space:
mode:
authorKarel Zak2014-10-07 12:12:39 +0200
committerKarel Zak2014-10-07 12:12:39 +0200
commitc4604c38b503c8c46e50fc2048ebbcbcfcad3802 (patch)
tree76c437a9bdd22f6afd872cfb72ce3d41f390f8e8 /sys-utils/flock.1
parentlosetup: improve man page -D docs (diff)
downloadkernel-qcow2-util-linux-c4604c38b503c8c46e50fc2048ebbcbcfcad3802.tar.gz
kernel-qcow2-util-linux-c4604c38b503c8c46e50fc2048ebbcbcfcad3802.tar.xz
kernel-qcow2-util-linux-c4604c38b503c8c46e50fc2048ebbcbcfcad3802.zip
flock: zero timeout is valid
This patch reverts Sami's "timeout cannot be zero", introduced in commit 605325b23b36238c8f3ae165e37cab9064553cf7. The --timeout 0 has been originally interpreted as --nonblock. The patch also add hint about this behavior to the man page. Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1149974 Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'sys-utils/flock.1')
-rw-r--r--sys-utils/flock.14
1 files changed, 3 insertions, 1 deletions
diff --git a/sys-utils/flock.1 b/sys-utils/flock.1
index 276d72633..f69040190 100644
--- a/sys-utils/flock.1
+++ b/sys-utils/flock.1
@@ -103,7 +103,9 @@ Fail if the lock cannot be acquired within
Decimal fractional values are allowed.
See the
.B \-E
-option for the exit code used.
+option for the exit code used. The zero number of
+.IR seconds
+is interpreted as \fB\-\-nonblock\fR.
.TP
.BR \-V , " \-\-version"
Display version information and exit.