summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2008-11-20 17:02:55 +1100
committerNeilBrown <neilb@suse.de>2008-11-20 17:03:56 +1100
commit0d172d634f153165a730181572abe90c3a2b646f (patch)
treebfeae36b1df83b967dfcffcd6bfd82775a527864
parentb6e15d73b19d963de7412560cc651e3b6d6a5428 (diff)
downloadmdadm-sles11.tar.gz
Assemble: don't auto-assemble if any arrays are listed in mdadm.confsles11
Auto-assembly and planned assembly don't really work well together, it can be confusing. In particular in mkinitrd or similar creates an mdadm.conf to assemble a particular array, we shouldn't go assembling any other arrays as well. If you want auto assembly, you need to give mdadm a config file with no ARRAY lines. mdadm -Ascpartitions can do this. Signed-off-by: NeilBrown <neilb@suse.de>
-rw-r--r--mdadm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mdadm.c b/mdadm.c
index 2bd963a..e0f51b7 100644
--- a/mdadm.c
+++ b/mdadm.c
@@ -1092,9 +1092,9 @@ int main(int argc, char *argv[])
array_list,
NULL, NULL,
readonly, runstop, NULL, homehost, verbose-quiet, force);
- if (rv == 0) cnt++;
+ cnt++;
}
- if (homehost) {
+ if (homehost && cnt == 0) {
/* Maybe we can auto-assemble something.
* Repeatedly call Assemble in auto-assemble mode
* until it fails