From: Stanislav Brabec <sbrabec@suse.cz>
Date: Thu, 4 Aug 2016 18:15:57 +0000 (+0200)
Subject: sfdisk: Add --show-pt-geometry compatibility code
X-Git-Tag: v2.28.1~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e1f4a8e99e80f614cecf2dd63134c84b53baf07;p=thirdparty%2Futil-linux.git

sfdisk: Add --show-pt-geometry compatibility code

--show-pt-geometry existed since cf3f26bf (2006), and it is used by third party
tools. To prevent failure of these tools, add a minimal compatibility code.

Signed-off-by: Stanislav Brabec <sbrabec@suse.cz>
---

diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c
index b520c9bc15..de231403b7 100644
--- a/disk-utils/sfdisk.c
+++ b/disk-utils/sfdisk.c
@@ -1836,6 +1836,7 @@ int main(int argc, char *argv[])
 		{ "reorder", no_argument,       NULL, 'r' },
 		{ "show-size", no_argument,	NULL, 's' },
 		{ "show-geometry", no_argument, NULL, 'g' },
+		{ "show-pt-geometry", no_argument, NULL, 'G' },
 		{ "quiet",   no_argument,       NULL, 'q' },
 		{ "verify",  no_argument,       NULL, 'V' },
 		{ "version", no_argument,       NULL, 'v' },
@@ -1861,7 +1862,7 @@ int main(int argc, char *argv[])
 	textdomain(PACKAGE);
 	atexit(close_stdout);
 
-	while ((c = getopt_long(argc, argv, "aAbcdfFghJlLo:O:nN:qrsTu:vVX:Y:w:",
+	while ((c = getopt_long(argc, argv, "aAbcdfFgGhJlLo:O:nN:qrsTu:vVX:Y:w:",
 					longopts, &longidx)) != -1) {
 		switch(c) {
 		case 'A':
@@ -1896,6 +1897,8 @@ int main(int argc, char *argv[])
 		case 'f':
 			sf->force = 1;
 			break;
+		case 'G':
+			warnx(_("--show-pt-geometry is no more implemented. Using --show-geometry."));
 		case 'g':
 			sf->act = ACT_SHOW_GEOM;
 			break;