summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2010-02-24 11:43:59 +1100
committerNeilBrown <neilb@suse.de>2010-02-24 11:43:59 +1100
commit4c1c3ad8cf69763a4c8c4ba692a8cb93327a4abf (patch)
tree6814b4f8b3c115bce5cdaf6428e14dea5008439c
parenta31128d2de3c3b60e6cbcceef391479ad3c0cfb4 (diff)
downloadmdadm-4c1c3ad8cf69763a4c8c4ba692a8cb93327a4abf.tar.gz
mdadm-4c1c3ad8cf69763a4c8c4ba692a8cb93327a4abf.tar.xz
mdadm-4c1c3ad8cf69763a4c8c4ba692a8cb93327a4abf.zip
Assemble: check inargv before complaining about stray arguments.
If --assemble is given a container and some other devices to assemble an array from, it complains with an error because that doesn't make sense. However it currently also complains if the list of devices was extract from the config file rather than being given on the command line. That is not appropriate. So add an '&& inargv' test to ensure that we are really complaining about the right thing. Signed-off-by: NeilBrown <neilb@suse.de> Acked-by: Dan Williams <dan.j.williams@intel.com>
-rw-r--r--Assemble.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Assemble.c b/Assemble.c
index e4d6181..23cc438 100644
--- a/Assemble.c
+++ b/Assemble.c
@@ -434,7 +434,7 @@ int Assemble(struct supertype *st, char *mddev,
}
}
st = tst; tst = NULL;
- if (!auto_assem && tmpdev->next != NULL) {
+ if (!auto_assem && inargv && tmpdev->next != NULL) {
fprintf(stderr, Name ": %s is a container, but is not "
"only device given: confused and aborting\n",
devname);