remove ANNOUNCE-2.0-devel-?

[thirdparty/mdadm.git] / config.c

diff --git a/config.c b/config.c
index 550bb80aed4f5be15dbf034a9726345d98fd1978..a5d5edd2a61691d1f7a2bfa1d593cb8fbb649710 100644 (file)
--- a/config.c
+++ b/config.c
@@ -202,13 +202,14 @@ struct conf_dev {
     char *name;
 } *cdevlist = NULL;
 
-void load_partitions(void)
+mddev_dev_t load_partitions(void)
 {
        FILE *f = fopen("/proc/partitions", "r");
        char buf[1024];
+       mddev_dev_t rv = NULL;
        if (f == NULL) {
                fprintf(stderr, Name ": cannot open /proc/partitions\n");
-               return;
+               return NULL;
        }
        while (fgets(buf, 1024, f)) {
                int major, minor;
@@ -223,15 +224,16 @@ void load_partitions(void)
 
                name = map_dev(major, minor);
                if (name) {
-                       struct conf_dev *cd;
+                       mddev_dev_t d;
 
-                       cd = malloc(sizeof(*cd));
-                       cd->name = strdup(name);
-                       cd->next = cdevlist;
-                       cdevlist = cd;
+                       d = malloc(sizeof(*d));
+                       d->devname = strdup(name);
+                       d->next = rv;
+                       rv = d;
                }
        }
        fclose(f);
+       return rv;
 }
 
 
@@ -241,14 +243,11 @@ void devline(char *line)
        struct conf_dev *cd;
 
        for (w=dl_next(line); w != line; w=dl_next(w)) {
-               if (w[0] == '/') {
+               if (w[0] == '/' || strcasecmp(w, "partitions") == 0) {
                        cd = malloc(sizeof(*cd));
                        cd->name = strdup(w);
                        cd->next = cdevlist;
                        cdevlist = cd;
-               } else if (strcasecmp(w, "partitions") == 0) {
-                       /* read /proc/partitions, and look major/minor up in /dev */
-                       load_partitions();
                } else {
                        fprintf(stderr, Name ": unreconised word on DEVICE line: %s\n",
                                w);
@@ -275,6 +274,10 @@ void arrayline(char *line)
        mis.devname = NULL;
        mis.spare_group = NULL;
        mis.autof = 0;
+       mis.next = NULL;
+       mis.st = NULL;
+       mis.bitmap_fd = -1;
+       mis.name[0] = 0;
 
        for (w=dl_next(line); w!=line; w=dl_next(w)) {
                if (w[0] == '/') {
@@ -293,7 +296,7 @@ void arrayline(char *line)
                                        fprintf(stderr, Name ": bad uuid: %s\n", w);
                        }
                } else if (strncasecmp(w, "super-minor=", 12)==0 ) {
-                       if (mis.super_minor >= 0)
+                       if (mis.super_minor != UnSet)
                                fprintf(stderr, Name ": only specify super-minor once, %s ignored.\n",
                                        w);
                        else {
@@ -305,6 +308,15 @@ void arrayline(char *line)
                                        mis.super_minor = UnSet;
                                }
                        }
+               } else if (strncasecmp(w, "name=", 5)==0) {
+                       if (mis.name[0])
+                               fprintf(stderr, Name ": only specify name once, %s ignored.\n",
+                                       w);
+                       else if (strlen(w+5) > 32)
+                               fprintf(stderr, Name ": name too long, ignoring %s\n", w);
+                       else
+                               strcpy(mis.name, w+5);
+
                } else if (strncasecmp(w, "devices=", 8 ) == 0 ) {
                        if (mis.devices)
                                fprintf(stderr, Name ": only specify devices once (use a comma separated list). %s ignored\n",
@@ -329,6 +341,15 @@ void arrayline(char *line)
                } else if (strncasecmp(w, "spares=", 7) == 0 ) {
                        /* for warning if not all spares present */
                        mis.spare_disks = atoi(w+7);
+               } 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);
+
+                       if (!mis.st)
+                               fprintf(stderr, Name ": metadata format %s unknown, ignored.\n", w+9);
                } else if (strncasecmp(w, "auto=", 5) == 0 ) {
                        /* whether to create device special files as needed */
                        if (strcasecmp(w+5, "no")==0)
@@ -336,7 +357,7 @@ void arrayline(char *line)
                        else if (strcasecmp(w+5,"yes")==0 || strcasecmp(w+5,"md")==0)
                                mis.autof = -1;
                        else {
-                               /* There might be digits, and maybe a hypen, at the end */
+                               /* There might be digits, and maybe a hyphen, at the end */
                                char *e = w+5 + strlen(w+5);
                                int num = 4;
                                int len;
@@ -364,7 +385,7 @@ void arrayline(char *line)
        }
        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)
+       else 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));
@@ -422,7 +443,11 @@ void load_conffile(char *conffile)
                return;
        }
        if (strcmp(conffile, "partitions")==0) {
-               load_partitions();
+               char *list = dl_strdup("DEV");
+               dl_init(list);
+               dl_add(list, dl_strdup("partitions"));
+               devline(list);
+               free_line(list);
                loaded = 1;
                return;
        }
@@ -497,8 +522,12 @@ mddev_dev_t conf_get_devs(char *conffile)
        load_conffile(conffile);
     
        for (cd=cdevlist; cd; cd=cd->next) {
-               glob(cd->name, flags, NULL, &globbuf);
-               flags |= GLOB_APPEND;
+               if (strcasecmp(cd->name, "partitions")==0 && dlist == NULL)
+                       dlist = load_partitions();
+               else {
+                       glob(cd->name, flags, NULL, &globbuf);
+                       flags |= GLOB_APPEND;
+               }
        }
        if (flags & GLOB_APPEND) {
                for (i=0; i<globbuf.gl_pathc; i++) {