From: Karel Zak <kzak@redhat.com>
Date: Tue, 3 Sep 2019 14:22:21 +0000 (+0200)
Subject: sfdisk: add -J between mutually exclusive options
X-Git-Tag: v2.35-rc1~239
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=03154d2cf25c1d5ce908da9e72d324004b8d5722;p=thirdparty%2Futil-linux.git

sfdisk: add -J between mutually exclusive options

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c
index f55f88f5ce..37d652b2f9 100644
--- a/disk-utils/sfdisk.c
+++ b/disk-utils/sfdisk.c
@@ -1986,7 +1986,7 @@ int main(int argc, char *argv[])
 		{ NULL, 0, NULL, 0 },
 	};
 	static const ul_excl_t excl[] = {	/* rows and cols in ASCII order */
-		{ 'F','d'},                     /* --list-free --dump */
+		{ 'F','J','d'},                 /* --list-free --json --dump */
 		{ 's','u'},			/* --show-size --unit */
 		{ 0 }
 	};