From: Benno Schulenberg <bensberg@justemail.net>
Date: Sat, 1 Aug 2015 08:23:09 +0000 (+0200)
Subject: mount: remove duplications of --help and --version from usage text
X-Git-Tag: v2.27-rc2~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89de71b3476ecc2713736673a3850059d07d5121;p=thirdparty%2Futil-linux.git

mount: remove duplications of --help and --version from usage text

And slice up the affected portions.

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---

diff --git a/sys-utils/mount.c b/sys-utils/mount.c
index c650efef2d..c22c8c9962 100644
--- a/sys-utils/mount.c
+++ b/sys-utils/mount.c
@@ -732,9 +732,10 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
 	" -F, --fork              fork off for each device (use with -a)\n"
 	" -T, --fstab <path>      alternative file to /etc/fstab\n"));
 	fprintf(out, _(
-	" -h, --help              display this help text and exit\n"
-	" -i, --internal-only     don't call the mount.<type> helpers\n"
-	" -l, --show-labels       lists all mounts with LABELs\n"
+	" -i, --internal-only     don't call the mount.<type> helpers\n"));
+	fprintf(out, _(
+	" -l, --show-labels       show also filesystem labels\n"));
+	fprintf(out, _(
 	" -n, --no-mtab           don't write to /etc/mtab\n"));
 	fprintf(out, _(
 	" -o, --options <list>    comma-separated list of mount options\n"
@@ -745,8 +746,8 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
 	"     --source <src>      explicitly specifies source (path, label, uuid)\n"
 	"     --target <target>   explicitly specifies mountpoint\n"));
 	fprintf(out, _(
-	" -v, --verbose           say what is being done\n"
-	" -V, --version           display version information and exit\n"
+	" -v, --verbose           say what is being done\n"));
+	fprintf(out, _(
 	" -w, --rw, --read-write  mount the filesystem read-write (default)\n"));
 
 	fputs(USAGE_SEPARATOR, out);