mdadm-1.4.0

[thirdparty/mdadm.git] / config.c

diff --git a/config.c b/config.c
index abb72c14708cac5719bcfa5b949be8297847c198..f02697e9206e996c3212e8a5bef6a032e6f2c86d 100644 (file)
--- a/config.c
+++ b/config.c
@@ -29,6 +29,7 @@
 
 #include       "mdadm.h"
 #include       "dlink.h"
+#include       <sys/dir.h>
 #include       <glob.h>
 #include       <fnmatch.h>
 
@@ -200,6 +201,33 @@ struct conf_dev {
     char *name;
 } *cdevlist = NULL;
 
+void load_partitions(void)
+{
+       FILE *f = fopen("/proc/partitions", "r");
+       char buf[1024];
+       if (f == NULL) {
+               fprintf(stderr, Name ": cannot open /proc/partitions\n");
+               return;
+       }
+       while (fgets(buf, 1024, f)) {
+               int major, minor;
+               char *name;
+               buf[1023] = '\0';
+               if (buf[0] != ' ')
+                       continue;
+               if (sscanf(buf, " %d %d ", &major, &minor) != 2)
+                       continue;
+               name = map_dev(major, minor);
+               if (name) {
+                       struct conf_dev *cd;
+
+                       cd = malloc(sizeof(*cd));
+                       cd->name = strdup(name);
+                       cd->next = cdevlist;
+                       cdevlist = cd;
+               }
+       }
+}
 
 
 void devline(char *line) 
@@ -213,6 +241,9 @@ void devline(char *line)
                        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);
@@ -234,6 +265,7 @@ void arrayline(char *line)
        mis.super_minor = -1;
        mis.level = -10;
        mis.raid_disks = -1;
+       mis.spare_disks = -1;
        mis.devices = NULL;
        mis.devname = NULL;
        mis.spare_group = NULL;
@@ -284,7 +316,13 @@ 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 {
                        fprintf(stderr, Name ": unrecognised word on ARRAY line: %s\n",
                                w);
@@ -345,6 +383,15 @@ void load_conffile(char *conffile)
        if (conffile == NULL)
                conffile = DefaultConfFile;
 
+       if (strcmp(conffile, "none") == 0) {
+               loaded = 1;
+               return;
+       }
+       if (strcmp(conffile, "partitions")==0) {
+               load_partitions();
+               loaded = 1;
+               return;
+       }
        f = fopen(conffile, "r");
        if (f ==NULL)
                return;