]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
Minor improvement in name auto-chosen for version-1 superblocks.
authorNeil Brown <neilb@suse.de>
Fri, 11 Aug 2006 07:59:57 +0000 (17:59 +1000)
committerNeil Brown <neilb@suse.de>
Fri, 11 Aug 2006 07:59:57 +0000 (17:59 +1000)
/dev/md_d0  should have name 'd0' by default to
make /dev/md/d0.

Create.c

index ba6a8247444bf350e6d803e339e76ac9191b0293..2dbc330975dd3a5c24e1a5997a44b226961ca8ad 100644 (file)
--- a/Create.c
+++ b/Create.c
@@ -397,6 +397,13 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 
        if (name == NULL || *name == 0) {
                /* base name on mddev */
+               /*  /dev/md0 -> 0
+                *  /dev/md_d0 -> d0
+                *  /dev/md/1 -> 1
+                *  /dev/md/d1 -> d1
+                *  /dev/md/home -> home
+                *  /dev/mdhome -> home
+                */
                name = strrchr(mddev, '/');
                if (name) {
                        name++;
@@ -404,7 +411,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                            strlen(name) > 4 &&
                            isdigit(name[4]) &&
                            (name-mddev) == 5 /* /dev/ */)
-                               name += 4;
+                               name += 3;
                        else if (strncmp(name, "md", 2)==0 &&
                                 strlen(name) > 2 &&
                                 isdigit(name[2]) &&