From: Darrick J. Wong <djwong@kernel.org>
Date: Fri, 12 Mar 2021 18:57:27 +0000 (-0500)
Subject: xfs_admin: don't add '=1' when building repair command line for -O
X-Git-Tag: v5.11.0~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16c64512bbc36e433e31659d8c1348bcb5b36009;p=thirdparty%2Fxfsprogs-dev.git

xfs_admin: don't add '=1' when building repair command line for -O

Geert Hendrickx reported an inconsistency between the xfs_admin manpage
and its behavior -- the documentation says that users must provide the
status explicitly, but the script injects '=1' anyway.  While this seems
to work with the glibc getsubopt, it's a bit ugly and isn't consistent
with the docs.

So, get rid of that extra two bytes.

Reported-by: Geert Hendrickx <geert@hendrickx.be>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/db/xfs_admin.sh b/db/xfs_admin.sh
index 7a467dbe8..02f34b737 100755
--- a/db/xfs_admin.sh
+++ b/db/xfs_admin.sh
@@ -20,7 +20,7 @@ do
 	j)	DB_OPTS=$DB_OPTS" -c 'version log2'";;
 	l)	DB_OPTS=$DB_OPTS" -r -c label";;
 	L)	DB_OPTS=$DB_OPTS" -c 'label "$OPTARG"'";;
-	O)	REPAIR_OPTS=$REPAIR_OPTS" -c $OPTARG=1";;
+	O)	REPAIR_OPTS=$REPAIR_OPTS" -c $OPTARG";;
 	p)	DB_OPTS=$DB_OPTS" -c 'version projid32bit'";;
 	r)	REPAIR_DEV_OPTS=" -r '$OPTARG'";;
 	u)	DB_OPTS=$DB_OPTS" -r -c uuid";;