From c4604c38b503c8c46e50fc2048ebbcbcfcad3802 Mon Sep 17 00:00:00 2001
From: Karel Zak
Date: Tue, 7 Oct 2014 12:12:39 +0200
Subject: 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>
---
 sys-utils/flock.1 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'sys-utils/flock.1')

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.
-- 
cgit v1.2.3-55-g7522