diff options
| -rw-r--r-- | mdadm.8 | 24 | ||||
| -rw-r--r-- | mdadm.c | 13 | ||||
| -rw-r--r-- | mdadm.conf.5 | 2 |
3 files changed, 19 insertions, 20 deletions
@@ -250,18 +250,6 @@ Avoid printing purely informative messages. With this, will be silent unless there is something really important to report. .TP -.BR \-b ", " \-\-brief -Be less verbose. This is used with -.B \-\-detail -and -.BR \-\-examine . -Using -.B \-\-brief -with -.B \-\-verbose -gives an intermediate level of verbosity. - -.TP .BR \-f ", " \-\-force Be more forceful about certain operations. See the various modes for the exact meaning of this option in different contexts. @@ -1794,6 +1782,18 @@ For .B \-\-scan causes all devices listed in the config file to be examined. +.TP +.BR \-b ", " \-\-brief +Be less verbose. This is used with +.B \-\-detail +and +.BR \-\-examine . +Using +.B \-\-brief +with +.B \-\-verbose +gives an intermediate level of verbosity. + .SH MONITOR MODE .HP 12 @@ -151,13 +151,10 @@ int main(int argc, char *argv[]) continue; case 'b': - if (mode == ASSEMBLE || mode == BUILD || mode == CREATE || mode == GROW) + if (mode == ASSEMBLE || mode == BUILD || mode == CREATE || mode == GROW || + mode == INCREMENTAL || mode == MANAGE) break; /* b means bitmap */ brief = 1; - if (optarg) { - fprintf(stderr, Name ": -b cannot have any extra immediately after it, sorry.\n"); - exit(2); - } continue; case 'Y': export++; @@ -267,7 +264,8 @@ int main(int argc, char *argv[]) continue; } /* No mode yet, and this is the second device ... */ - fprintf(stderr, Name ": An option must be given to set the mode before a second device is listed\n"); + fprintf(stderr, Name ": An option must be given to set the mode before a second device\n" + " (%s) is listed\n", optarg); exit(2); } if (option_index >= 0) @@ -874,7 +872,8 @@ int main(int argc, char *argv[]) continue; } /* probable typo */ - fprintf(stderr, Name ": bitmap file must contain a '/', or be 'internal', or 'none'\n"); + fprintf(stderr, Name ": bitmap file must contain a '/', or be 'internal', or 'none'\n" + " not '%s'\n", optarg); exit(2); case O(GROW,BitmapChunk): diff --git a/mdadm.conf.5 b/mdadm.conf.5 index 002e2b37..1c2ae58f 100644 --- a/mdadm.conf.5 +++ b/mdadm.conf.5 @@ -380,7 +380,7 @@ preceded by plus or minus is allowed and is usually last. When .I mdadm -is auto-assembling an array, with via +is auto-assembling an array, either via .I --assemble or .I --incremental |