From: NeilBrown <neilb@suse.de>
Date: Thu, 20 Nov 2008 06:02:55 +0000 (+1100)
Subject: Assemble: don't auto-assemble if any arrays are listed in mdadm.conf
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d172d634f153165a730181572abe90c3a2b646f;p=thirdparty%2Fmdadm.git

Assemble: don't auto-assemble if any arrays are listed in mdadm.conf

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>
---

diff --git a/mdadm.c b/mdadm.c
index 2bd963a5..e0f51b7f 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