summaryrefslogtreecommitdiffstats
path: root/Assemble.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2008-11-04 20:50:39 +1100
committerNeilBrown <neilb@suse.de>2008-11-04 20:50:39 +1100
commitac2ecf554303102ca23554a925fae91ac4fa57ca (patch)
treebcdc8460a8eeb2f7f2c7c91b19281d497a116d19 /Assemble.c
parent11fb4c054f7e440be699be5db683e891e3eaf3a5 (diff)
downloadmdadm-ac2ecf554303102ca23554a925fae91ac4fa57ca.tar.gz
mdadm-ac2ecf554303102ca23554a925fae91ac4fa57ca.tar.xz
mdadm-ac2ecf554303102ca23554a925fae91ac4fa57ca.zip
assemble: fix setting of 'foreign' trustability.
Diffstat (limited to 'Assemble.c')
-rw-r--r--Assemble.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/Assemble.c b/Assemble.c
index dbbabdb..1c9486b 100644
--- a/Assemble.c
+++ b/Assemble.c
@@ -426,6 +426,13 @@ int Assemble(struct supertype *st, char *mddev,
trustworthy = FOREIGN;
break;
}
+ if (!auto_assem && trustworthy == FOREIGN)
+ /* If the array is listed in mdadm or on
+ * command line, then we trust the name
+ * even if the array doesn't look local
+ */
+ trustworthy = LOCAL;
+
if (info.name[0] == 0 &&
info.array.level == LEVEL_CONTAINER) {
name = info.text_version;