summaryrefslogtreecommitdiffstats
path: root/Monitor.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2009-05-11 15:18:35 +1000
committerNeilBrown <neilb@suse.de>2009-05-11 15:18:35 +1000
commitdb2d001cee64cd330cc2ab24ddefed48eb67fc7b (patch)
treefc0b9dc7a4bfac82f6a823d8e70b59df8a0eac8b /Monitor.c
parentaa7c284c06ba046039f60ceb4e3fb422967d354f (diff)
downloadmdadm-db2d001cee64cd330cc2ab24ddefed48eb67fc7b.tar.gz
mdadm-db2d001cee64cd330cc2ab24ddefed48eb67fc7b.tar.xz
mdadm-db2d001cee64cd330cc2ab24ddefed48eb67fc7b.zip
config: allow Array line to contain array name without /dev/md/ prefix.
For consistency with --create and --assemble, allow the array name given in mdadm.conf to exclude the "/dev/md/" prefix. So e.g. ARRAY home uuid=whatever is treated like ARRAY /dev/md/home uuid=whatever Also exclude names which create_mddev will reject. Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'Monitor.c')
-rw-r--r--Monitor.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/Monitor.c b/Monitor.c
index 4b660e4..e43175f 100644
--- a/Monitor.c
+++ b/Monitor.c
@@ -173,7 +173,13 @@ int Monitor(mddev_dev_t devlist,
st = malloc(sizeof *st);
if (st == NULL)
continue;
- st->devname = strdup(mdlist->devname);
+ if (mdlist->devname[0] == '/')
+ st->devname = strdup(mdlist->devname);
+ else {
+ st->devname = malloc(8+strlen(mdlist->devname)+1);
+ strcpy(strcpy(st->devname, "/dev/md/"),
+ mdlist->devname);
+ }
st->utime = 0;
st->next = statelist;
st->err = 0;