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 c650efef2d5359b973a2fd53fa77d571711e207c..c22c8c996254e6b9558021609b7761da786030a7 100644 (file)
--- 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);