summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Brown <neilb@suse.de>2006-08-11 17:59:57 +1000
committerNeil Brown <neilb@suse.de>2006-08-11 17:59:57 +1000
commitd1e80164a278b1ad5a56be7abe98a5a3a40e7629 (patch)
tree8ca40931f34ac7b4acbebb06f0ee9ba4c5dcf02a
parentc56d3db4d3f50cdeab4dcf2976b6ab9475730a35 (diff)
downloadmdadm-d1e80164a278b1ad5a56be7abe98a5a3a40e7629.tar.gz
mdadm-d1e80164a278b1ad5a56be7abe98a5a3a40e7629.tar.xz
mdadm-d1e80164a278b1ad5a56be7abe98a5a3a40e7629.zip
Minor improvement in name auto-chosen for version-1 superblocks.
/dev/md_d0 should have name 'd0' by default to make /dev/md/d0.
-rw-r--r--Create.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/Create.c b/Create.c
index ba6a824..2dbc330 100644
--- 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]) &&