Drop the superblock arg from all metadata methods.

[thirdparty/mdadm.git] / config.c

diff --git a/config.c b/config.c
index 219308dc703740f715cba595c285ba1464ed480a..29eadc5927c06816593f0f7c9d1d744a27a1e7a5 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)
@@ -173,7 +173,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 +237,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 +255,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 */
@@ -291,6 +292,8 @@ int parse_auto(char *str, char *msg, int config)
                len = e - str;
                if ((len == 2 && strncasecmp(str,"md",2)==0)) {
                        autof = config ? 5 : 3;
+               } else if ((len == 3 && strncasecmp(str,"yes",3)==0)) {
+                       autof = 2;
                } else if ((len == 3 && strncasecmp(str,"mdp",3)==0)) {
                        autof = config ? 6 : 4;
                } else if ((len == 1 && strncasecmp(str,"p",1)==0) ||
@@ -376,7 +379,7 @@ static void createline(char *line)
        }
 }
 
-void devline(char *line) 
+void devline(char *line)
 {
        char *w;
        struct conf_dev *cd;
@@ -462,7 +465,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)
@@ -491,7 +494,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);
 
@@ -654,7 +657,7 @@ void load_conffile(void)
                }
                free_line(line);
        }
-    
+
        fclose(f);
 
 /*    printf("got file\n"); */
@@ -714,7 +717,7 @@ mddev_dev_t conf_get_devs()
                free(t->devname);
                free(t);
        }
-    
+
        load_conffile();
 
        if (cdevlist == NULL)
@@ -744,6 +747,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