Fix "--config=partitions" which was broken.

[thirdparty/mdadm.git] / config.c

diff --git a/config.c b/config.c
index abb72c14708cac5719bcfa5b949be8297847c198..0aac1a0b0cde7a712c9d09078a8f157ba0c30bca 100644 (file)
--- a/config.c
+++ b/config.c
@@ -29,8 +29,10 @@
 
 #include       "mdadm.h"
 #include       "dlink.h"
+#include       <sys/dir.h>
 #include       <glob.h>
 #include       <fnmatch.h>
+#include       <ctype.h>
 
 /*
  * Read the config file
@@ -200,6 +202,39 @@ struct conf_dev {
     char *name;
 } *cdevlist = NULL;
 
+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 NULL;
+       }
+       while (fgets(buf, 1024, f)) {
+               int major, minor;
+               char *name, *mp;
+               buf[1023] = '\0';
+               if (buf[0] != ' ')
+                       continue;
+               major = strtoul(buf, &mp, 10);
+               if (mp == buf || *mp != ' ') 
+                       continue;
+               minor = strtoul(mp, NULL, 10);
+
+               name = map_dev(major, minor);
+               if (name) {
+                       mddev_dev_t d;
+
+                       d = malloc(sizeof(*d));
+                       d->devname = strdup(name);
+                       d->next = rv;
+                       rv = d;
+               }
+       }
+       fclose(f);
+       return rv;
+}
 
 
 void devline(char *line) 
@@ -208,7 +243,7 @@ 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;
@@ -231,12 +266,14 @@ void arrayline(char *line)
        mddev_ident_t mi;
 
        mis.uuid_set = 0;
-       mis.super_minor = -1;
-       mis.level = -10;
-       mis.raid_disks = -1;
+       mis.super_minor = UnSet;
+       mis.level = UnSet;
+       mis.raid_disks = UnSet;
+       mis.spare_disks = UnSet;
        mis.devices = NULL;
        mis.devname = NULL;
        mis.spare_group = NULL;
+       mis.autof = 0;
 
        for (w=dl_next(line); w!=line; w=dl_next(w)) {
                if (w[0] == '/') {
@@ -264,7 +301,7 @@ void arrayline(char *line)
                                if (w[12]==0 || endptr[0]!=0 || mis.super_minor < 0) {
                                        fprintf(stderr, Name ": invalid super-minor number: %s\n",
                                                w);
-                                       mis.super_minor = -1;
+                                       mis.super_minor = UnSet;
                                }
                        }
                } else if (strncasecmp(w, "devices=", 8 ) == 0 ) {
@@ -284,15 +321,49 @@ void arrayline(char *line)
                        mis.level = map_name(pers, w+6);
                } else if (strncasecmp(w, "disks=", 6) == 0 ) {
                        /* again, for compat */
-                       mis.raid_disks = atoi(w+6);                        
+                       mis.raid_disks = atoi(w+6);
+               } else if (strncasecmp(w, "num-devices=", 12) == 0 ) {
+                       /* again, for compat */
+                       mis.raid_disks = atoi(w+12);
+               } else if (strncasecmp(w, "spares=", 7) == 0 ) {
+                       /* for warning if not all spares present */
+                       mis.spare_disks = atoi(w+7);
+               } else if (strncasecmp(w, "auto=", 5) == 0 ) {
+                       /* whether to create device special files as needed */
+                       if (strcasecmp(w+5, "no")==0)
+                               mis.autof = 0;
+                       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 */
+                               char *e = w+5 + strlen(w+5);
+                               int num = 4;
+                               int len;
+                               while (e > w+5 && isdigit(e[-1]))
+                                       e--;
+                               if (*e) {
+                                       num = atoi(e);
+                                       if (num <= 0) num = 1;
+                               }
+                               if (e > w+5 && e[-1] == '-')
+                                       e--;
+                               len = e - (w+5);
+                               if ((len == 3 && strncasecmp(w+5,"mdp",3)==0) ||
+                                   (len == 1 && strncasecmp(w+5,"p",1)==0) ||
+                                   (len >= 4 && strncasecmp(w+5,"part",4)==0))
+                                       mis.autof = num;
+                               else 
+                                       fprintf(stderr, Name ": auto type of \"%s\" ignored for %s\n",
+                                               w+5, mis.devname?mis.devname:"unlabeled-array");
+                       }
                } else {
                        fprintf(stderr, Name ": unrecognised word on ARRAY line: %s\n",
                                w);
                }
        }
        if (mis.devname == NULL)
-               fprintf(stderr, Name ": ARRAY line with a device\n");
-       else if (mis.uuid_set == 0 && mis.devices == NULL && mis.super_minor < 0)
+               fprintf(stderr, Name ": ARRAY line with no device\n");
+       else if (mis.uuid_set == 0 && mis.devices == NULL && mis.super_minor == UnSet)
                fprintf(stderr, Name ": ARRAY line %s has no identity information.\n", mis.devname);
        else {
                mi = malloc(sizeof(*mi));
@@ -345,6 +416,19 @@ void load_conffile(char *conffile)
        if (conffile == NULL)
                conffile = DefaultConfFile;
 
+       if (strcmp(conffile, "none") == 0) {
+               loaded = 1;
+               return;
+       }
+       if (strcmp(conffile, "partitions")==0) {
+               char *list = dl_strdup("DEV");
+               dl_init(list);
+               dl_add(list, dl_strdup("partitions"));
+               devline(list);
+               free_line(list);
+               loaded = 1;
+               return;
+       }
        f = fopen(conffile, "r");
        if (f ==NULL)
                return;
@@ -370,6 +454,7 @@ void load_conffile(char *conffile)
                free_line(line);
        }
     
+       fclose(f);
 
 /*    printf("got file\n"); */
 }
@@ -403,7 +488,7 @@ mddev_dev_t conf_get_devs(char *conffile)
        struct conf_dev *cd;
        int flags = 0;
        static mddev_dev_t dlist = NULL;
-       int i;
+       unsigned int i;
 
        while (dlist) {
                mddev_dev_t t = dlist;
@@ -415,8 +500,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++) {