From 60248f743376a69e155f2a48cb77b89b281602ff Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Mon, 7 Aug 2006 11:30:02 +1000 Subject: Tidyup automatic name choice for v-1 arrays /dev/md_d0 now becomes '0', not '_d0'. --- Create.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'Create.c') diff --git a/Create.c b/Create.c index 75db382..ba6a824 100644 --- a/Create.c +++ b/Create.c @@ -30,6 +30,7 @@ #include "mdadm.h" #include "md_u.h" #include "md_p.h" +#include 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; } } -- cgit