conf/assemble: new config line "auto".

[thirdparty/mdadm.git] / Assemble.c

diff --git a/Assemble.c b/Assemble.c
index 47b8839e4835df1cf7461df07f6641e9ce577c3c..4966a79822045b19331497952f9f1ad37259e9dc 100644 (file)
--- a/Assemble.c
+++ b/Assemble.c
@@ -263,6 +263,13 @@ int Assemble(struct supertype *st, char *mddev,
                                fprintf(stderr, Name ": no recogniseable superblock on %s\n",
                                        devname);
                        tmpdev->used = 2;
+               } else if (auto_assem && st == NULL &&
+                          !conf_test_metadata(tst->ss->name)) {
+                       if (report_missmatch)
+                               fprintf(stderr, Name ": %s has metadata type %s for which "
+                                       "auto-assembly is disabled\n",
+                                       devname, tst->ss->name);
+                       tmpdev->used = 2;
                } else if (tst->ss->load_super(tst,dfd, NULL)) {
                        if (report_missmatch)
                                fprintf( stderr, Name ": no RAID superblock on %s\n",