Change name from --noformat to --dryrun for clarity

diff --git a/lustre/doc/mkfs.lustre.8 b/lustre/doc/mkfs.lustre.8
index ea030cc..67329da 100644 (file)
--- a/lustre/doc/mkfs.lustre.8
+++ b/lustre/doc/mkfs.lustre.8
@@ -43,6 +43,9 @@ Set user comment about this disk, ignored by Lustre.
 .BI \--device-size= KB
 Set device size for loop devices
 .TP
+.BI \--dryrun
+Only print what would be done; does not affect the disk
+.TP
 .BI \--failnode= nid,...  
 Set the NID(s) of a failover partner. This option can be repeated as desired.
 .TP
@@ -61,9 +64,6 @@ Set permanent mount options, equivalent to setting in /etc/fstab
 .BI \--mgsnode= nid,...  
 Set the NID(s) of the MGS node, required for all targets other than the MGS.
 .TP
-.BI \--noformat 
-Only print what would be done; does not affect the disk
-.TP
 .BI \--param " key=value"
 Set permanent parameter 
 .I key 

diff --git a/lustre/doc/tunefs.lustre.8 b/lustre/doc/tunefs.lustre.8
index 7228340..7300b1f 100644 (file)
--- a/lustre/doc/tunefs.lustre.8
+++ b/lustre/doc/tunefs.lustre.8
@@ -27,6 +27,9 @@ mounted.
 .BI \--comment= comment
 Set user comment about this disk, ignored by Lustre.
 .TP
+.BI \--dryrun
+Only print what would be done; does not affect the disk
+.TP
 .BI \--erase-params
 Remove all previous parameter info
 .TP
@@ -48,9 +51,6 @@ Add a configuration management service to this target
 .BI \--mgsnode= nid,...  
 Set the NID(s) of the MGS node, required for all targets other than the MGS.
 .TP
-.BI \--noformat 
-Only print what would be done; does not affect the disk
-.TP
 .BI \--nomgs
 Remove a configuration management service to this target
 .TP

diff --git a/lustre/utils/mkfs_lustre.c b/lustre/utils/mkfs_lustre.c
index 73f395c..dc5ba4e 100644 (file)
--- a/lustre/utils/mkfs_lustre.c
+++ b/lustre/utils/mkfs_lustre.c
@@ -110,7 +110,7 @@ void usage(FILE *out)
                 "\t\t--nomgs: turn off MGS service on this MDT\n"
                 "\t\t--writeconf: erase all config logs for this fs.\n"
 #endif
-                "\t\t--noformat: just report what we would do; "
+                "\t\t--dryrun: just report what we would do; "
                 "don't write to disk\n"
                 "\t\t--verbose : e.g. show mkfs progress\n"
                 "\t\t--quiet\n",
@@ -970,6 +970,7 @@ int parse_opts(int argc, char *const argv[], struct mkfs_opts *mop,
                 {"comment", 1, 0, 'u'},
                 {"configdev", 1, 0, 'C'},
                 {"device-size", 1, 0, 'd'},
+                {"dryrun", 0, 0, 'n'},
                 {"erase-params", 0, 0, 'e'},
                 {"failnode", 1, 0, 'f'},
                 {"failover", 1, 0, 'f'},