From 1d04e275703831d4883e5991d8685e86ec27041b Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Wed, 5 Dec 2012 11:06:55 +1100 Subject: [PATCH] Assemble: Don't auto-assemble arrays which conflict with mdadm.conf When auto-assembling we might find an array which appear in mdadm.conf. This can happen if the array (based on UUID) doesn't match what is in mdadm.conf. For consistency we should avoid auto-assembling such an array just as we avoid regular-assembling of the array. Reported-by: Ross Boylan Signed-off-by: NeilBrown --- Assemble.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Assemble.c b/Assemble.c index 9ef1bf0..eeb5e4a 100644 --- a/Assemble.c +++ b/Assemble.c @@ -385,6 +385,13 @@ static int select_devices(struct mddev_dev *devlist, devname); goto loop; } + if (match && !ident_matches(match, content, tst, + c->homehost, c->update, + report_missmatch ? devname : NULL)) + /* Array exists in mdadm.conf but some + * details don't match, so reject it + */ + goto loop; /* should be safe to try an exclusive open now, we * have rejected anything that some other mdadm might