Improve the message when mdadm detects similar superblocks

If they are for a partition and a whole device (common case)
they old message doesn't really cover the situation.  So add
the "overlap" option to the text.
Also detect whether the device list was in mdadm.conf and
act accordingly.

diff --git a/Assemble.c b/Assemble.c
index 3c00c9116cbd19d5f9f8b29e0aac8b40b1c022a1..5acb076caf01cec617d31a2d71f095f0583fe650 100644 (file)
--- a/Assemble.c
+++ b/Assemble.c
@@ -531,9 +531,12 @@ int Assemble(struct supertype *st, char *mddev, int mdfd,
                                        " to have very similar superblocks.\n"
                                        "      If they are really different, "
                                        "please --zero the superblock on one\n"
-                                       "      If they are the same, please remove "
-                                       "one from the list.\n",
-                                       devices[best[i]].devname, devname);
+                                       "      If they are the same or overlap,"
+                                       " please remove one from %s.\n",
+                                       devices[best[i]].devname, devname,
+                                       inargv ? "the list" :
+                                          "the\n      DEVICE list in mdadm.conf"
+                                       );
                                if (must_close) close(mdfd);
                                return 1;
                        }