From: Phillip Susi <psusi@ubuntu.com>
Date: Fri, 7 Feb 2014 22:01:20 +0000 (-0500)
Subject: fix mkfs --verbose and man page
X-Git-Tag: v2.25-rc1~609
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5ab5bec7392a1b5de271ce6299ef9e355187652;p=thirdparty%2Futil-linux.git

fix mkfs --verbose and man page

mkfs did not actually accept the long form --verbose option.
Also the man page seemed to indicate that version/verbose/help
options were passed to the filesystem specific utility when this
is not the case.

Signed-off-by: Phillip Susi <psusi@ubuntu.com>
---

diff --git a/disk-utils/mkfs.8 b/disk-utils/mkfs.8
index 9e82bc4651..3b905b2845 100644
--- a/disk-utils/mkfs.8
+++ b/disk-utils/mkfs.8
@@ -53,8 +53,6 @@ If not specified, the default filesystem type
 .TP
 .I fs-options
 Filesystem-specific options to be passed to the real filesystem builder.
-Although not guaranteed, the following options are supported
-by most filesystem builders.
 .TP
 .BR \-V , " \-\-verbose"
 Produce verbose output, including all filesystem-specific commands
@@ -73,10 +71,7 @@ Display help text and exit.
 .SH BUGS
 All generic options must precede and not be combined with
 filesystem-specific options.
-Some filesystem-specific programs do not support the
-.B -V
-(verbose) option, nor return meaningful exit codes.
-Also, some filesystem-specific programs do not automatically
+Some filesystem-specific programs do not automatically
 detect the device size and require the
 .I size
 parameter to be specified.
diff --git a/disk-utils/mkfs.c b/disk-utils/mkfs.c
index a6795cb0e4..cb34951b20 100644
--- a/disk-utils/mkfs.c
+++ b/disk-utils/mkfs.c
@@ -73,6 +73,7 @@ int main(int argc, char **argv)
 	static const struct option longopts[] = {
 		{"type", required_argument, NULL, 't'},
 		{"version", no_argument, NULL, VERSION_OPTION},
+		{"verbose", no_argument, NULL, 'V'},
 		{"help", no_argument, NULL, 'h'},
 		{NULL, 0, NULL, 0}
 	};