summaryrefslogtreecommitdiffstats
path: root/mdadm.c
diff options
context:
space:
mode:
authorNeil Brown <neilb@suse.de>2005-06-14 06:34:23 +0000
committerNeil Brown <neilb@suse.de>2005-06-14 06:34:23 +0000
commit22892d5632b454a18be7fb36a82b4c1af691ef66 (patch)
treef3c723ec1101fff5f565fc8ff122361f3375925a /mdadm.c
parentb79713f8c103031e10bb41bb552a023a884b2ad4 (diff)
downloadmdadm-22892d5632b454a18be7fb36a82b4c1af691ef66.tar.gz
mdadm-22892d5632b454a18be7fb36a82b4c1af691ef66.tar.xz
mdadm-22892d5632b454a18be7fb36a82b4c1af691ef66.zip
Don't list device= in --examine --scan output.
As the device list isn't stable, recording it should be avoided. The device= list is still available if --verbose is given (once). Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Diffstat (limited to 'mdadm.c')
-rw-r--r--mdadm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/mdadm.c b/mdadm.c
index 54c011e..bc264b1 100644
--- a/mdadm.c
+++ b/mdadm.c
@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
fputs(Version, stderr);
exit(0);
- case 'v': verbose = 1;
+ case 'v': verbose++;
continue;
case 'b':
@@ -939,7 +939,7 @@ int main(int argc, char *argv[])
fprintf(stderr, Name ": No devices listed in %s\n", configfile?configfile:DefaultConfFile);
exit(1);
}
- rv = Examine(devlist, scan?!verbose:brief, scan, SparcAdjust, ss);
+ rv = Examine(devlist, scan?(verbose>1?0:verbose+1):brief, scan, SparcAdjust, ss);
} else {
if (devlist == NULL) {
if (devmode=='D' && scan) {
@@ -954,7 +954,7 @@ int main(int argc, char *argv[])
e->dev);
continue;
}
- rv |= Detail(name, !verbose, test);
+ rv |= Detail(name, verbose>1?0:verbose+1, test);
put_md_name(name);
}
} else if (devmode == 'S' && scan) {
@@ -998,7 +998,7 @@ int main(int argc, char *argv[])
for (dv=devlist ; dv; dv=dv->next) {
switch(dv->disposition) {
case 'D':
- rv |= Detail(dv->devname, brief, test); continue;
+ rv |= Detail(dv->devname, brief?1+verbose:0, test); continue;
case 'K': /* Zero superblock */
rv |= Kill(dv->devname, force); continue;
case 'Q':