Received-SPF: pass (google.com: domain of linux-nfs+bounces-2110-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: NeilBrown <neilb@suse.de>,
	Steve Dickson <steved@redhat.com>
Cc: linux-nfs@vger.kernel.org,
	kernel@pengutronix.de,
	Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH nfs-utils] start-statd: use flock -x instead of -e for busybox compatibility
Date: Wed, 28 Feb 2024 19:56:44 +0100
Message-Id: <20240228185644.2743036-1-a.fatoum@pengutronix.de>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

busybox flock(1) only supports -x and not -e. util-linux flock(1)
treats both -e and -x the same, documents them both in its man page,
but lists only -x in its help output.

Referring to util-linux git, it seems both options were added between
util-linux-2.13-pre1 and util-linux-2.13-pre2 back in 2006, so there
should be no harm in switching over to flock -x to avoid confusing
error output when attempting to mount a NFS on a busybox system:

  $ mount -t nfs 192.168.2.13:/home/afa/nfsroot/imx8mn-evk /mnt
  flock: invalid option -- 'e'
  BusyBox v1.36.0 () multi-call binary.

  Usage: flock [-sxun] FD | { FILE [-c] PROG ARGS }

  [Un]lock file descriptor, or lock FILE, run PROG

          -s      Shared lock
          -x      Exclusive lock (default)
          -u      Unlock FD
          -n      Fail rather than wait

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 utils/statd/start-statd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/statd/start-statd b/utils/statd/start-statd
index b11a7d91a7f6..67a2f4ad8e0e 100755
--- a/utils/statd/start-statd
+++ b/utils/statd/start-statd
@@ -8,7 +8,7 @@ PATH="/sbin:/usr/sbin:/bin:/usr/bin"
 
 # Use flock to serialize the running of this script
 exec 9> /run/rpc.statd.lock
-flock -e 9
+flock -x 9
 
 if [ -s /run/rpc.statd.pid ] &&
        [ "1$(cat /run/rpc.statd.pid)" -gt 1 ] &&
-- 
2.39.2