More consistent honoring of --configfile

[thirdparty/mdadm.git] / Create.c

diff --git a/Create.c b/Create.c
index fe7a3abebe5dd3f349f560ec19bf6ffb5e8a5d31..75db38235efe647e00b4b8cea99cd2c9075f39a0 100644 (file)
--- a/Create.c
+++ b/Create.c
@@ -33,7 +33,7 @@
 
 int Create(struct supertype *st, char *mddev, int mdfd,
           int chunk, int level, int layout, unsigned long long size, int raiddisks, int sparedisks,
-          char *name,
+          char *name, char *homehost,
           int subdevs, mddev_dev_t devlist,
           int runstop, int verbose, int force, int assume_clean,
           char *bitmap_file, int bitmap_chunk, int write_behind, int delay)
@@ -214,6 +214,11 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                        ldsize = dsize;
                        ldsize <<= 9;
                }
+               if (st == NULL) {
+                       struct createinfo *ci = conf_get_create_info();
+                       if (ci)
+                               st = ci->supertype;
+               }
                if (st == NULL) {
                        /* Need to choose a default metadata, which is different
                         * depending on the sizes of devices
@@ -389,7 +394,18 @@ int Create(struct supertype *st, char *mddev, int mdfd,
        array.chunk_size = chunk*1024;
        array.major_version = st->ss->major;
 
-       if (!st->ss->init_super(st, &super, &array, size, name))
+       if (name == NULL || *name == 0) {
+               /* base name on mddev */
+               name = strrchr(mddev, '/');
+               if (name) {
+                       name++;
+                       if (strncmp(name, "md", 2)==0 &&
+                           strlen(name) > 2 &&
+                           (name-mddev) == 5 /* /dev/ */)
+                               name += 2;
+               }
+       }
+       if (!st->ss->init_super(st, &super, &array, size, name, homehost))
                return 1;
 
        if (bitmap_file && vers < 9003) {