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>

diff --git a/Assemble.c b/Assemble.c
index e421f22d2eddd0ddfd0e307b95fdb27a08e98e58..12e67b2cc2061396b35021e6683bfc0415a92016 100644 (file)
--- 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 {