diff options
| -rw-r--r-- | Monitor.c | 8 | ||||
| -rw-r--r-- | config.c | 45 | ||||
| -rw-r--r-- | mdadm.conf.5 | 10 |
3 files changed, 55 insertions, 8 deletions
@@ -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; @@ -448,6 +448,17 @@ void devline(char *line) mddev_ident_t mddevlist = NULL; mddev_ident_t *mddevlp = &mddevlist; +static int is_number(char *w) +{ + /* check if there are 1 or more digits and nothing else */ + int digits = 0; + while (*w && isdigit(*w)) { + digits++; + w++; + } + return (digits && ! *w); +} + void arrayline(char *line) { char *w; @@ -473,11 +484,35 @@ void arrayline(char *line) mis.member = NULL; for (w=dl_next(line); w!=line; w=dl_next(w)) { - if (w[0] == '/' || strcasecmp(w, "<ignore>") == 0) { - if (mis.devname) - fprintf(stderr, Name ": only give one device per ARRAY line: %s and %s\n", - mis.devname, w); - else mis.devname = w; + if (w[0] == '/' || strchr(w, '=') == NULL) { + /* This names the device, or is '<ignore>'. + * The rules match those in create_mddev. + * 'w' must be: + * /dev/md/{anything} + * /dev/mdNN + * /dev/md_dNN + * <ignore> + * or anything that doesn't start '/' or '<' + */ + if (strcasecmp(w, "<ignore>") == 0 || + strncmp(w, "/dev/md/", 8) == 0 || + (w[0] != '/' && w[0] != '<') || + (strncmp(w, "/dev/md", 7) == 0 && + is_number(w+7)) || + (strncmp(w, "/dev/md_d", 9) == 0 && + is_number(w+9)) + ) { + /* This is acceptable */; + if (mis.devname) + fprintf(stderr, Name ": only give one " + "device per ARRAY line: %s and %s\n", + mis.devname, w); + else + mis.devname = w; + }else { + fprintf(stderr, Name ": %s is an invalid name for " + "an md device - ignored.\n", w); + } } else if (strncasecmp(w, "uuid=", 5)==0 ) { if (mis.uuid_set) fprintf(stderr, Name ": only specify uuid once, %s ignored.\n", diff --git a/mdadm.conf.5 b/mdadm.conf.5 index f69c0b0..9876d27 100644 --- a/mdadm.conf.5 +++ b/mdadm.conf.5 @@ -95,14 +95,20 @@ DEVICE partitions The ARRAY lines identify actual arrays. The second word on the line may be the name of the device where the array is normally assembled, such as -.BR /dev/md1 . +.B /dev/md1 +or +.BR /dev/md/backup . +If the name does not start with a slash +.RB (' / '), +it is treated as being in +.BR /dev/md/ . Alternately the word .B <ignore> (complete with angle brackets) can be given in which case any array which matches the rest of the line will never be automatically assembled. If no device name is given, .I mdadm -will use various heuristic to determine an appropriate name. +will use various heuristics to determine an appropriate name. .PP Subsequent words identify the array, or identify the array as a member of a group. If multiple identities are given, |