summaryrefslogtreecommitdiffstats
path: root/Assemble.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2008-11-04 20:51:12 +1100
committerNeilBrown <neilb@suse.de>2008-11-04 20:51:12 +1100
commitf05641cf7a250bda189f16d9c6b917683e5c9aad (patch)
tree13e5d32162ebebb3872bc611f77764380b78f4d7 /Assemble.c
parent42dc2744a82a4fd31262f5d4d0082118c9d64a52 (diff)
downloadmdadm-f05641cf7a250bda189f16d9c6b917683e5c9aad.tar.gz
mdadm-f05641cf7a250bda189f16d9c6b917683e5c9aad.tar.xz
mdadm-f05641cf7a250bda189f16d9c6b917683e5c9aad.zip
Assemble: revise detection of 'autoassemble' mode.
We probably should pass a flag down saying 'this is auto-assembly', but for now, if there is no identity information set, it must be auto-assemble. Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'Assemble.c')
-rw-r--r--Assemble.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/Assemble.c b/Assemble.c
index e421f22..12e67b2 100644
--- a/Assemble.c
+++ b/Assemble.c
@@ -138,7 +138,9 @@ int Assemble(struct supertype *st, char *mddev,
*/
int mdfd;
int clean;
- int auto_assem = (mddev == NULL);
+ int auto_assem = (mddev == NULL && !ident->uuid_set &&
+ ident->super_minor == UnSet && ident->name[0] == 0
+ && ident->container == NULL && ident->member == NULL);
int old_linux = 0;
int vers = vers; /* Keep gcc quite - it really is initialised */
struct {