Can now mostly assemble DDF arrays

[thirdparty/mdadm.git] / config.c

diff --git a/config.c b/config.c
index d251fbfb58aae71fe8ad215fdc344f3a107583b8..121b3373554076212b844823847bce18e7d96eff 100644 (file)
--- a/config.c
+++ b/config.c
@@ -29,7 +29,7 @@
 
 #include       "mdadm.h"
 #include       "dlink.h"
-#include       <sys/dir.h>
+#include       <dirent.h>
 #include       <glob.h>
 #include       <fnmatch.h>
 #include       <ctype.h>
@@ -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);
 
@@ -255,6 +268,7 @@ mddev_dev_t load_partitions(void)
 }
 
 struct createinfo createinfo = {
+       .autof = 2, /* by default, create devices with standard names */
        .symlinks = 1,
 #ifdef DEBIAN
        .gid = 6, /* disk */
@@ -378,7 +392,7 @@ static void createline(char *line)
        }
 }
 
-void devline(char *line) 
+void devline(char *line)
 {
        char *w;
        struct conf_dev *cd;
@@ -464,7 +478,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 +507,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);
 
@@ -656,7 +670,7 @@ void load_conffile(void)
                }
                free_line(line);
        }
-    
+
        fclose(f);
 
 /*    printf("got file\n"); */
@@ -716,7 +730,7 @@ mddev_dev_t conf_get_devs()
                free(t->devname);
                free(t);
        }
-    
+
        load_conffile();
 
        if (cdevlist == NULL)
@@ -746,6 +760,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