X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=config.c;h=8b2335594cd21e7cfa4153f0dc90ae33a721e8bb;hb=98dbd96605fe7f995934ddc778f06e7b21dbcef4;hp=d251fbfb58aae71fe8ad215fdc344f3a107583b8;hpb=6ba83b5f5e8946d49877229752e76a14b7672f69;p=thirdparty%2Fmdadm.git diff --git a/config.c b/config.c index d251fbfb..8b233559 100644 --- a/config.c +++ b/config.c @@ -29,7 +29,7 @@ #include "mdadm.h" #include "dlink.h" -#include +#include #include #include #include @@ -86,7 +86,7 @@ char *keywords[] = { [Mailaddr] = "mailaddr", [Mailfrom] = "mailfrom", [Program] = "program", - [CreateDev] = "create", + [CreateDev]= "create", [Homehost] = "homehost", [LTEnd] = NULL }; @@ -100,7 +100,7 @@ int match_keyword(char *word) { int len = strlen(word); int n; - + if (len < 3) return -1; for (n=0; keywords[n]; n++) { if (strncasecmp(word, keywords[n], len)==0) @@ -161,11 +161,24 @@ char *conf_word(FILE *file, int allow_key) word[len++] = c; } c = getc(file); + /* Hack for broken kernels (2.6.14-.24) that put + * "active(auto-read-only)" + * in /proc/mdstat instead of + * "active (auto-read-only)" + */ + if (c == '(' && len >= 6 + && strncmp(word+len-6, "active", 6) == 0) + c = ' '; } } if (c != EOF) ungetc(c, file); } word[len] = 0; + + /* Further HACK for broken kernels.. 2.6.14-2.6.24 */ + if (strcmp(word, "auto-read-only)") == 0) + strcpy(word, "(auto-read-only)"); + /* printf("word is <%s>\n", word); */ if (!wordfound) { free(word); @@ -173,7 +186,7 @@ char *conf_word(FILE *file, int allow_key) } return word; } - + /* * conf_line reads one logical line from the conffile. * It skips comments and continues until it finds a line that starts @@ -237,7 +250,7 @@ mddev_dev_t load_partitions(void) if (buf[0] != ' ') continue; major = strtoul(buf, &mp, 10); - if (mp == buf || *mp != ' ') + if (mp == buf || *mp != ' ') continue; minor = strtoul(mp, NULL, 10); @@ -254,7 +267,38 @@ mddev_dev_t load_partitions(void) return rv; } +mddev_dev_t load_containers(void) +{ + struct mdstat_ent *mdstat = mdstat_read(1, 0); + struct mdstat_ent *ent; + mddev_dev_t d; + mddev_dev_t rv = NULL; + + if (!mdstat) + return NULL; + + for (ent = mdstat; ent; ent = ent->next) + if (ent->metadata_version && + strncmp(ent->metadata_version, "external:", 9) == 0 && + !is_subarray(&ent->metadata_version[9])) { + d = malloc(sizeof(*d)); + if (!d) + continue; + if (asprintf(&d->devname, "/dev/%s", ent->dev) < 0) { + free(d); + continue; + } + d->next = rv; + d->used = 0; + rv = d; + } + free_mdstat(mdstat); + + return rv; +} + struct createinfo createinfo = { + .autof = 2, /* by default, create devices with standard names */ .symlinks = 1, #ifdef DEBIAN .gid = 6, /* disk */ @@ -378,13 +422,14 @@ static void createline(char *line) } } -void devline(char *line) +void devline(char *line) { char *w; struct conf_dev *cd; for (w=dl_next(line); w != line; w=dl_next(w)) { - if (w[0] == '/' || strcasecmp(w, "partitions") == 0) { + if (w[0] == '/' || strcasecmp(w, "partitions") == 0 || + strcasecmp(w, "containers") == 0) { cd = malloc(sizeof(*cd)); cd->name = strdup(w); cd->next = cdevlist; @@ -420,6 +465,8 @@ void arrayline(char *line) mis.bitmap_fd = -1; mis.bitmap_file = NULL; mis.name[0] = 0; + mis.container = NULL; + mis.member = NULL; for (w=dl_next(line); w!=line; w=dl_next(w)) { if (w[0] == '/') { @@ -464,7 +511,7 @@ void arrayline(char *line) fprintf(stderr, Name ": only specify bitmap file once. %s ignored\n", w); else - mis.bitmap_file = w+7; + mis.bitmap_file = strdup(w+7); } else if (strncasecmp(w, "devices=", 8 ) == 0 ) { if (mis.devices) @@ -493,7 +540,7 @@ void arrayline(char *line) } else if (strncasecmp(w, "metadata=", 9) == 0) { /* style of metadata on the devices. */ int i; - + for(i=0; superlist[i] && !mis.st; i++) mis.st = superlist[i]->match_metadata_desc(w+9); @@ -502,19 +549,24 @@ void arrayline(char *line) } else if (strncasecmp(w, "auto=", 5) == 0 ) { /* whether to create device special files as needed */ mis.autof = parse_auto(w+5, "auto type", 0); + } else if (strncasecmp(w, "member=", 7) == 0) { + /* subarray within a container */ + mis.member = strdup(w+7); + } else if (strncasecmp(w, "container=", 10) == 0) { + /* the container holding this subarray. Either a device name + * or a uuid */ + mis.container = strdup(w+10); } else { fprintf(stderr, Name ": unrecognised word on ARRAY line: %s\n", w); } } - if (mis.devname == NULL) - fprintf(stderr, Name ": ARRAY line with no device\n"); - else if (mis.uuid_set == 0 && mis.devices == NULL && mis.super_minor == UnSet && mis.name[0] == 0) + if (mis.uuid_set == 0 && mis.devices == NULL && mis.super_minor == UnSet && mis.name[0] == 0) fprintf(stderr, Name ": ARRAY line %s has no identity information.\n", mis.devname); else { mi = malloc(sizeof(*mi)); *mi = mis; - mi->devname = strdup(mis.devname); + mi->devname = mis.devname ? strdup(mis.devname) : NULL; mi->next = NULL; *mddevlp = mi; mddevlp = &mi->next; @@ -544,10 +596,12 @@ void mailfromline(char *line) if (alert_mail_from == NULL) alert_mail_from = strdup(w); else { - char *t= NULL; - asprintf(&t, "%s %s", alert_mail_from, w); - free(alert_mail_from); - alert_mail_from = t; + char *t = NULL; + + if (asprintf(&t, "%s %s", alert_mail_from, w) > 0) { + free(alert_mail_from); + alert_mail_from = t; + } } } } @@ -656,7 +710,7 @@ void load_conffile(void) } free_line(line); } - + fclose(f); /* printf("got file\n"); */ @@ -697,11 +751,19 @@ mddev_ident_t conf_get_ident(char *dev) mddev_ident_t rv; load_conffile(); rv = mddevlist; - while (dev && rv && strcmp(dev, rv->devname)!=0) + while (dev && rv && (rv->devname == NULL + || strcmp(dev, rv->devname)!=0)) rv = rv->next; return rv; } +static void append_dlist(mddev_dev_t *dlp, mddev_dev_t list) +{ + while (*dlp) + dlp = &(*dlp)->next; + *dlp = list; +} + mddev_dev_t conf_get_devs() { glob_t globbuf; @@ -716,16 +778,20 @@ mddev_dev_t conf_get_devs() free(t->devname); free(t); } - + load_conffile(); - if (cdevlist == NULL) - /* default to 'partitions */ + if (cdevlist == NULL) { + /* default to 'partitions' and 'containers' */ dlist = load_partitions(); + append_dlist(&dlist, load_containers()); + } for (cd=cdevlist; cd; cd=cd->next) { - if (strcasecmp(cd->name, "partitions")==0 && dlist == NULL) - dlist = load_partitions(); + if (strcasecmp(cd->name, "partitions")==0) + append_dlist(&dlist, load_partitions()); + else if (strcasecmp(cd->name, "containers")==0) + append_dlist(&dlist, load_containers()); else { glob(cd->name, flags, NULL, &globbuf); flags |= GLOB_APPEND; @@ -746,6 +812,22 @@ mddev_dev_t conf_get_devs() return dlist; } +int conf_test_dev(char *devname) +{ + struct conf_dev *cd; + if (cdevlist == NULL) + /* allow anything by default */ + return 1; + for (cd = cdevlist ; cd ; cd = cd->next) { + if (strcasecmp(cd->name, "partitions") == 0) + return 1; + if (fnmatch(cd->name, devname, FNM_PATHNAME) == 0) + return 1; + } + return 0; +} + + int match_oneof(char *devices, char *devname) { /* check if one of the comma separated patterns in devices