Tidyup automatic name choice for v-1 arrays

 /dev/md_d0 now becomes '0', not '_d0'.

diff --git a/ChangeLog b/ChangeLog
index 0640dc5a555417bce99043d850ed39cc99541200..c1e1b7da8b0b00a92a1f1289c5e59c7d150802ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@ Changes Prior to 2.5.3 release
     -   Document v0.91 superblocks in md.4
     -   Make GPL explicit in man pages.
     -   Fix recent breakage of starting degraded arrays.
+    -   Tidyup automatic name choice for v-1 arrays:
+         /dev/md_d0 now becomes '0', not '_d0'.
 
 Changes Prior to 2.5.2 release
     -   Fix problem with compiling with gcc-2 compilers

diff --git a/Create.c b/Create.c
index 75db38235efe647e00b4b8cea99cd2c9075f39a0..ba6a8247444bf350e6d803e339e76ac9191b0293 100644 (file)
--- a/Create.c
+++ b/Create.c
@@ -30,6 +30,7 @@
 #include "mdadm.h"
 #include       "md_u.h"
 #include       "md_p.h"
+#include       <ctype.h>
 
 int Create(struct supertype *st, char *mddev, int mdfd,
           int chunk, int level, int layout, unsigned long long size, int raiddisks, int sparedisks,
@@ -399,9 +400,15 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                name = strrchr(mddev, '/');
                if (name) {
                        name++;
-                       if (strncmp(name, "md", 2)==0 &&
-                           strlen(name) > 2 &&
+                       if (strncmp(name, "md_d", 4)==0 &&
+                           strlen(name) > 4 &&
+                           isdigit(name[4]) &&
                            (name-mddev) == 5 /* /dev/ */)
+                               name += 4;
+                       else if (strncmp(name, "md", 2)==0 &&
+                                strlen(name) > 2 &&
+                                isdigit(name[2]) &&
+                                (name-mddev) == 5 /* /dev/ */)
                                name += 2;
                }
        }