33 lines
1.2 KiB
Plaintext
33 lines
1.2 KiB
Plaintext
|
From 4c1c3ad8cf69763a4c8c4ba692a8cb93327a4abf Mon Sep 17 00:00:00 2001
|
||
|
|
From: NeilBrown <neilb@suse.de>
|
||
|
|
Date: Wed, 24 Feb 2010 11:43:59 +1100
|
||
|
|
Subject: [PATCH] Assemble: check inargv before complaining about stray arguments.
|
||
|
|
References: bnc#598827
|
||
|
|
|
||
|
|
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>
|
||
|
|
|
||
|
|
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);
|