]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - mdadm.c
main: factor out code to parse layout for raid10 and faulty.
[thirdparty/mdadm.git] / mdadm.c
diff --git a/mdadm.c b/mdadm.c
index bc8aac877000d342c48c6b2340b4cb6604390166..82e2d4383014ad13b1ae8a375409d731926ceb6f 100644 (file)
--- a/mdadm.c
+++ b/mdadm.c
@@ -26,7 +26,7 @@
  *           Sydney, 2052
  *           Australia
  *
- *    Additions for bitmap and write-behind RAID options, Copyright (C) 2003-2004, 
+ *    Additions for bitmap and write-behind RAID options, Copyright (C) 2003-2004,
  *    Paul Clements, SteelEye Technology, Inc.
  */
 
@@ -46,6 +46,7 @@ int main(int argc, char *argv[])
 
        int chunk = 0;
        long long size = -1;
+       long long array_size = -1;
        int level = UnSet;
        int layout = UnSet;
        int raiddisks = 0;
@@ -74,6 +75,7 @@ int main(int argc, char *argv[])
        int brief = 0;
        int force = 0;
        int test = 0;
+       int export = 0;
        int assume_clean = 0;
        char *symlinks = NULL;
        /* autof indicates whether and how to create device node.
@@ -90,6 +92,7 @@ int main(int argc, char *argv[])
 
        char *homehost = NULL;
        char sys_hostname[256];
+       int require_homehost = 1;
        char *mailaddr = NULL;
        char *program = NULL;
        int delay = 0;
@@ -101,10 +104,11 @@ int main(int argc, char *argv[])
        int re_add = 0;
        char *shortopt = short_options;
        int dosyslog = 0;
+       int rebuild_map = 0;
        int auto_update_home = 0;
 
-       int copies;
        int print_help = 0;
+       FILE *outf;
 
        int mdfd = -1;
 
@@ -121,16 +125,18 @@ int main(int argc, char *argv[])
        ident.bitmap_fd = -1;
        ident.bitmap_file = NULL;
        ident.name[0] = 0;
+       ident.container = NULL;
+       ident.member = NULL;
 
        while ((option_index = -1) ,
               (opt=getopt_long(argc, argv,
                                shortopt, long_options,
                                &option_index)) != -1) {
                int newmode = mode;
-               /* firstly, some mode-independant options */
+               /* firstly, some mode-independent options */
                switch(opt) {
                case 'h':
-                       if (option_index > 0 && 
+                       if (option_index > 0 &&
                            strcmp(long_options[option_index].name, "help-options")==0)
                                print_help = 2;
                        else
@@ -157,8 +163,14 @@ int main(int argc, char *argv[])
                        }
                        continue;
 
+               case 'Y': export++;
+                       continue;
+
                case HomeHost:
-                       homehost = optarg;
+                       if (strcasecmp(optarg, "<ignore>") == 0)
+                               require_homehost = 0;
+                       else
+                               homehost = optarg;
                        continue;
 
                case ':':
@@ -168,13 +180,13 @@ int main(int argc, char *argv[])
                }
                /* second, figure out the mode.
                 * Some options force the mode.  Others
-                * set the mode if it isn't already 
+                * set the mode if it isn't already
                 */
 
                switch(opt) {
                case '@': /* just incase they say --manage */
                        newmode = MANAGE;
-                       shortopt = short_bitmap_auto_options;
+                       shortopt = short_bitmap_options;
                        break;
                case 'a':
                case 'r':
@@ -182,7 +194,7 @@ int main(int argc, char *argv[])
                case ReAdd: /* re-add */
                        if (!mode) {
                                newmode = MANAGE;
-                               shortopt = short_bitmap_auto_options;
+                               shortopt = short_bitmap_options;
                        }
                        break;
 
@@ -190,7 +202,13 @@ int main(int argc, char *argv[])
                case 'B': newmode = BUILD; shortopt = short_bitmap_auto_options; break;
                case 'C': newmode = CREATE; shortopt = short_bitmap_auto_options; break;
                case 'F': newmode = MONITOR;break;
-               case 'G': newmode = GROW; shortopt = short_bitmap_auto_options; break;
+               case 'G': newmode = GROW;
+                       shortopt = short_bitmap_options;
+                       break;
+               case 'I': newmode = INCREMENTAL;
+                       shortopt = short_bitmap_auto_options; break;
+               case AutoDetect:
+                       newmode = AUTODETECT; break;
 
                case '#':
                case 'D':
@@ -201,6 +219,9 @@ int main(int argc, char *argv[])
                case 'S':
                case 'o':
                case 'w':
+               case 'W':
+               case Waitclean:
+               case DetailPlatform:
                case 'K': if (!mode) newmode = MISC; break;
                }
                if (mode && newmode == mode) {
@@ -220,10 +241,10 @@ int main(int argc, char *argv[])
                        mode = newmode;
                } else {
                        /* special case of -c --help */
-                       if (opt == 'c' && 
+                       if (opt == 'c' &&
                            ( strncmp(optarg, "--h", 3)==0 ||
                              strncmp(optarg, "-h", 2)==0)) {
-                               fputs(Help_config, stderr);
+                               fputs(Help_config, stdout);
                                exit(0);
                        }
 
@@ -240,10 +261,11 @@ int main(int argc, char *argv[])
                                        dv->writemostly = writemostly;
                                        dv->re_add = re_add;
                                        dv->used = 0;
+                                       dv->content = NULL;
                                        dv->next = NULL;
                                        *devlistend = dv;
                                        devlistend = &dv->next;
-                       
+
                                        devs_found++;
                                        continue;
                                }
@@ -268,6 +290,8 @@ int main(int argc, char *argv[])
                case 'C':
                case 'F':
                case 'G':
+               case 'I':
+               case AutoDetect:
                        continue;
                }
                if (opt == 1) {
@@ -290,10 +314,12 @@ int main(int argc, char *argv[])
                        dv->disposition = devmode;
                        dv->writemostly = writemostly;
                        dv->re_add = re_add;
+                       dv->used = 0;
+                       dv->content = NULL;
                        dv->next = NULL;
                        *devlistend = dv;
                        devlistend = &dv->next;
-                       
+
                        devs_found++;
                        continue;
                }
@@ -320,6 +346,7 @@ int main(int argc, char *argv[])
                case O(ASSEMBLE,AutoHomeHost):
                        auto_update_home = 1;
                        continue;
+               case O(INCREMENTAL, 'e'):
                case O(CREATE,'e'):
                case O(ASSEMBLE,'e'):
                case O(MISC,'e'): /* set metadata (superblock) information */
@@ -327,7 +354,7 @@ int main(int argc, char *argv[])
                                fprintf(stderr, Name ": metadata information already given\n");
                                exit(2);
                        }
-                       for(i=0; !ss && superlist[i]; i++) 
+                       for(i=0; !ss && superlist[i]; i++)
                                ss = superlist[i]->match_metadata_desc(optarg);
 
                        if (!ss) {
@@ -344,8 +371,15 @@ int main(int argc, char *argv[])
                        writemostly = 1;
                        continue;
 
+               case O(MANAGE,'w'):
+                       /* clear write-mostly for following devices */
+                       writemostly = 2;
+                       continue;
+
+
                case O(GROW,'z'):
-               case O(CREATE,'z'): /* size */
+               case O(CREATE,'z'):
+               case O(BUILD,'z'): /* size */
                        if (size >= 0) {
                                fprintf(stderr, Name ": size may only be specified once. "
                                        "Second value is %s.\n", optarg);
@@ -363,6 +397,24 @@ int main(int argc, char *argv[])
                        }
                        continue;
 
+               case O(GROW,'Z'): /* array size */
+                       if (array_size >= 0) {
+                               fprintf(stderr, Name ": array-size may only be specified once. "
+                                       "Second value is %s.\n", optarg);
+                               exit(2);
+                       }
+                       if (strcmp(optarg, "max") == 0)
+                               array_size = 0;
+                       else {
+                               array_size = parse_size(optarg);
+                               if (array_size <= 0) {
+                                       fprintf(stderr, Name ": invalid array size: %s\n",
+                                               optarg);
+                                       exit(2);
+                               }
+                       }
+                       continue;
+
                case O(GROW,'l'): /* hack - needed to understand layout */
                case O(CREATE,'l'):
                case O(BUILD,'l'): /* set raid level*/
@@ -408,7 +460,6 @@ int main(int argc, char *argv[])
                                exit(2);
 
                        case 5:
-                       case 6:
                                layout = map_name(r5layout, optarg);
                                if (layout==UnSet) {
                                        fprintf(stderr, Name ": layout %s not understood for raid5.\n",
@@ -416,40 +467,32 @@ int main(int argc, char *argv[])
                                        exit(2);
                                }
                                break;
+                       case 6:
+                               layout = map_name(r6layout, optarg);
+                               if (layout==UnSet) {
+                                       fprintf(stderr, Name ": layout %s not understood for raid6.\n",
+                                               optarg);
+                                       exit(2);
+                               }
+                               break;
 
                        case 10:
-                               /* 'f', 'o' or 'n' followed by a number <= raid_disks */
-                               if ((optarg[0] !=  'n' && optarg[0] != 'f' && optarg[0] != 'o') ||
-                                   (copies = strtoul(optarg+1, &cp, 10)) < 1 ||
-                                   copies > 200 ||
-                                   *cp) {
+                               layout = parse_layout_10(optarg);
+                               if (layout < 0) {
                                        fprintf(stderr, Name ": layout for raid10 must be 'nNN', 'oNN' or 'fNN' where NN is a number, not %s\n", optarg);
                                        exit(2);
                                }
-                               if (optarg[0] == 'n')
-                                       layout = 256 + copies;
-                               else if (optarg[0] == 'o')
-                                       layout = 0x10000 + (copies<<8) + 1;
-                               else
-                                       layout = 1 + (copies<<8);
                                break;
                        case -5: /* Faulty
                                  * modeNNN
                                  */
-                                   
-                       {
-                               int ln = strcspn(optarg, "0123456789");
-                               char *m = strdup(optarg);
-                               int mode;
-                               m[ln] = 0;
-                               mode = map_name(faultylayout, m);
-                               if (mode == UnSet) {
+                               layout = parse_layout_faulty(optarg);
+                               if (layout == -1) {
                                        fprintf(stderr, Name ": layout %s not understood for faulty.\n",
                                                optarg);
                                        exit(2);
                                }
-                               layout = mode | (atoi(optarg+ln)<< ModeShift);
-                       }
+                               break;
                        }
                        continue;
 
@@ -496,6 +539,7 @@ int main(int argc, char *argv[])
 
                case O(CREATE,'a'):
                case O(BUILD,'a'):
+               case O(INCREMENTAL,'a'):
                case O(ASSEMBLE,'a'): /* auto-creation of device node */
                        autof = parse_auto(optarg, "--auto flag", 0);
                        continue;
@@ -515,6 +559,7 @@ int main(int argc, char *argv[])
                        continue;
 
                        /* now for the Assemble options */
+               case O(CREATE,'u'): /* uuid of array */
                case O(ASSEMBLE,'u'): /* uuid of array */
                        if (ident.uuid_set) {
                                fprintf(stderr, Name ": uuid cannot be set twice.  "
@@ -568,7 +613,7 @@ int main(int argc, char *argv[])
                                exit(2);
                        }
                        update = optarg;
-                       if (strcmp(update, "sparc2.2")==0) 
+                       if (strcmp(update, "sparc2.2")==0)
                                continue;
                        if (strcmp(update, "super-minor") == 0)
                                continue;
@@ -582,12 +627,14 @@ int main(int argc, char *argv[])
                                continue;
                        if (strcmp(update, "homehost")==0)
                                continue;
+                       if (strcmp(update, "devicesize")==0)
+                               continue;
                        if (strcmp(update, "byteorder")==0) {
                                if (ss) {
                                        fprintf(stderr, Name ": must not set metadata type with --update=byteorder.\n");
                                        exit(2);
                                }
-                               for(i=0; !ss && superlist[i]; i++) 
+                               for(i=0; !ss && superlist[i]; i++)
                                        ss = superlist[i]->match_metadata_desc("0.swap");
                                if (!ss) {
                                        fprintf(stderr, Name ": INTERNAL ERROR cannot find 0.swap\n");
@@ -596,14 +643,29 @@ int main(int argc, char *argv[])
 
                                continue;
                        }
-                       fprintf(stderr, Name ": '--update %s' invalid.  Only 'sparc2.2', 'super-minor', 'uuid', 'resync' or 'summaries' supported\n",update);
-                       exit(2);
+                       if (strcmp(update,"?") == 0 ||
+                           strcmp(update, "help") == 0) {
+                               outf = stdout;
+                               fprintf(outf, Name ": ");
+                       } else {
+                               outf = stderr;
+                               fprintf(outf,
+                                       Name ": '--update=%s' is invalid.  ",
+                                       update);
+                       }
+                       fprintf(outf, "Valid --update options are:\n"
+               "     'sparc2.2', 'super-minor', 'uuid', 'name', 'resync',\n"
+               "     'summaries', 'homehost', 'byteorder', 'devicesize'.\n");
+                       exit(outf == stdout ? 0 : 2);
 
+               case O(INCREMENTAL,NoDegraded):
                case O(ASSEMBLE,NoDegraded): /* --no-degraded */
-                       runstop = -1; /* --stop isn't allowed for --assemble, so we overload slightly */
+                       runstop = -1; /* --stop isn't allowed for --assemble,
+                                      * so we overload slightly */
                        continue;
 
                case O(ASSEMBLE,'c'): /* config file */
+               case O(INCREMENTAL, 'c'):
                case O(MISC, 'c'):
                case O(MONITOR,'c'):
                        if (configfile) {
@@ -618,6 +680,7 @@ int main(int argc, char *argv[])
                case O(ASSEMBLE,'s'): /* scan */
                case O(MISC,'s'):
                case O(MONITOR,'s'):
+               case O(INCREMENTAL,'s'):
                        scan = 1;
                        continue;
 
@@ -670,7 +733,7 @@ int main(int argc, char *argv[])
                        test = 1;
                        continue;
                case O(MONITOR,'y'): /* log messages to syslog */
-                       openlog("mdadm", 0, SYSLOG_FACILITY);
+                       openlog("mdadm", LOG_PID, SYSLOG_FACILITY);
                        dosyslog = 1;
                        continue;
 
@@ -692,6 +755,7 @@ int main(int argc, char *argv[])
                case O(MANAGE,'f'): /* set faulty */
                        devmode = 'f';
                        continue;
+               case O(INCREMENTAL,'R'):
                case O(MANAGE,'R'):
                case O(ASSEMBLE,'R'):
                case O(BUILD,'R'):
@@ -710,21 +774,6 @@ int main(int argc, char *argv[])
                        runstop = -1;
                        continue;
 
-               case O(MANAGE,'o'):
-                       if (readonly < 0) {
-                               fprintf(stderr, Name ": Cannot have both readonly and readwrite\n");
-                               exit(2);
-                       }
-                       readonly = 1;
-                       continue;
-               case O(MANAGE,'w'):
-                       if (readonly > 0) {
-                               fprintf(stderr, Name ": Cannot have both readwrite and readonly.\n");
-                               exit(2);
-                       }
-                       readonly = -1;
-                       continue;
-
                case O(MISC,'Q'):
                case O(MISC,'D'):
                case O(MISC,'E'):
@@ -734,6 +783,9 @@ int main(int argc, char *argv[])
                case O(MISC,'X'):
                case O(MISC,'o'):
                case O(MISC,'w'):
+               case O(MISC,'W'):
+               case O(MISC, Waitclean):
+               case O(MISC, DetailPlatform):
                        if (devmode && devmode != opt &&
                            (devmode == 'E' || (opt == 'E' && devmode != 'Q'))) {
                                fprintf(stderr, Name ": --examine/-E cannot be given with -%c\n",
@@ -783,9 +835,15 @@ int main(int argc, char *argv[])
                        backup_file = optarg;
                        continue;
 
-               case O(GROW,'b'):
                case O(BUILD,'b'):
                case O(CREATE,'b'): /* here we create the bitmap */
+                       if (strcmp(optarg, "none") == 0) {
+                               fprintf(stderr, Name ": '--bitmap none' only"
+                                       " support for --grow\n");
+                               exit(2);
+                       }
+                       /* FALL THROUGH */
+               case O(GROW,'b'):
                        if (strcmp(optarg, "internal")== 0 ||
                            strcmp(optarg, "none")== 0 ||
                            strchr(optarg, '/') != NULL) {
@@ -810,6 +868,7 @@ int main(int argc, char *argv[])
                        bitmap_chunk = bitmap_chunk ? bitmap_chunk * 1024 : 512;
                        continue;
 
+               case O(GROW, WriteBehind):
                case O(BUILD, WriteBehind):
                case O(CREATE, WriteBehind): /* write-behind mode */
                        write_behind = DEFAULT_MAX_WRITE_BEHIND;
@@ -822,6 +881,10 @@ int main(int argc, char *argv[])
                                }
                        }
                        continue;
+
+               case O(INCREMENTAL, 'r'):
+                       rebuild_map = 1;
+                       continue;
                }
                /* We have now processed all the valid options. Anything else is
                 * an error
@@ -850,8 +913,9 @@ int main(int argc, char *argv[])
                        case MISC     : help_text = Help_misc; break;
                        case MONITOR  : help_text = Help_monitor; break;
                        case GROW     : help_text = Help_grow; break;
+                       case INCREMENTAL:help_text= Help_incr; break;
                        }
-               fputs(help_text,stderr);
+               fputs(help_text,stdout);
                exit(0);
        }
 
@@ -895,19 +959,39 @@ int main(int argc, char *argv[])
                        exit(2);
                }
                if ((int)ident.super_minor == -2 && autof) {
-                       fprintf(stderr, Name ": --super-minor=dev is incompatible with --auto\n");      
+                       fprintf(stderr, Name ": --super-minor=dev is incompatible with --auto\n");
                        exit(2);
                }
-               if (mode == MANAGE || mode == GROW)
-                       autof=1; /* Don't create */
-               mdfd = open_mddev(devlist->devname, autof);
-               if (mdfd < 0)
+               if (mode == MANAGE || mode == GROW) {
+                       mdfd = open_mddev(devlist->devname, 1);
+                       if (mdfd < 0)
+                               exit(1);
+               } else
+                       /* non-existent device is OK */
+                       mdfd = open_mddev(devlist->devname, 0);
+               if (mdfd == -2) {
+                       fprintf(stderr, Name ": device %s exists but is not an "
+                               "md array.\n", devlist->devname);
                        exit(1);
+               }
                if ((int)ident.super_minor == -2) {
                        struct stat stb;
+                       if (mdfd < 0) {
+                               fprintf(stderr, Name ": --super-minor=dev given, and "
+                                       "listed device %s doesn't exist.\n",
+                                       devlist->devname);
+                               exit(1);
+                       }
                        fstat(mdfd, &stb);
                        ident.super_minor = minor(stb.st_rdev);
                }
+               if (mdfd >= 0 && mode != MANAGE && mode != GROW) {
+                       /* We don't really want this open yet, we just might
+                        * have wanted to check some things
+                        */
+                       close(mdfd);
+                       mdfd = -1;
+               }
        }
 
        if (raiddisks) {
@@ -932,14 +1016,16 @@ int main(int argc, char *argv[])
        }
 
        if (homehost == NULL)
-               homehost = conf_get_homehost();
-       if (homehost && strcmp(homehost, "<system>")==0) {
+               homehost = conf_get_homehost(&require_homehost);
+       if (homehost == NULL || strcmp(homehost, "<system>")==0) {
                if (gethostname(sys_hostname, sizeof(sys_hostname)) == 0) {
                        sys_hostname[sizeof(sys_hostname)-1] = 0;
                        homehost = sys_hostname;
                }
        }
 
+       ident.autof = autof;
+
        rv = 0;
        switch(mode) {
        case MANAGE:
@@ -963,22 +1049,23 @@ int main(int argc, char *argv[])
                                fprintf(stderr, Name ": %s not identified in config file.\n",
                                        devlist->devname);
                                rv |= 1;
-                       } else {
-                               mdfd = open_mddev(devlist->devname, 
-                                                 array_ident->autof ? array_ident->autof : autof);
-                               if (mdfd < 0)
-                                       rv |= 1;
-                               else {
-                                       rv |= Assemble(ss, devlist->devname, mdfd, array_ident,
-                                                      NULL, backup_file,
-                                                      readonly, runstop, update, homehost, verbose-quiet, force);
+                               if (mdfd >= 0)
                                        close(mdfd);
-                               }
+                       } else {
+                               if (array_ident->autof == 0)
+                                       array_ident->autof = autof;
+                               rv |= Assemble(ss, devlist->devname, array_ident,
+                                              NULL, backup_file,
+                                              readonly, runstop, update,
+                                              homehost, require_homehost,
+                                              verbose-quiet, force);
                        }
                } else if (!scan)
-                       rv = Assemble(ss, devlist->devname, mdfd, &ident,
+                       rv = Assemble(ss, devlist->devname, &ident,
                                      devlist->next, backup_file,
-                                     readonly, runstop, update, homehost, verbose-quiet, force);
+                                     readonly, runstop, update,
+                                     homehost, require_homehost,
+                                     verbose-quiet, force);
                else if (devs_found>0) {
                        if (update && devs_found > 1) {
                                fprintf(stderr, Name ": can only update a single array at a time\n");
@@ -996,16 +1083,13 @@ int main(int argc, char *argv[])
                                        rv |= 1;
                                        continue;
                                }
-                               mdfd = open_mddev(dv->devname, 
-                                                 array_ident->autof ?array_ident->autof : autof);
-                               if (mdfd < 0) {
-                                       rv |= 1;
-                                       continue;
-                               }
-                               rv |= Assemble(ss, dv->devname, mdfd, array_ident,
+                               if (array_ident->autof == 0)
+                                       array_ident->autof = autof;
+                               rv |= Assemble(ss, dv->devname, array_ident,
                                               NULL, backup_file,
-                                              readonly, runstop, update, homehost, verbose-quiet, force);
-                               close(mdfd);
+                                              readonly, runstop, update,
+                                              homehost, require_homehost,
+                                              verbose-quiet, force);
                        }
                } else {
                        mddev_ident_t array_list =  conf_get_ident(NULL);
@@ -1024,40 +1108,38 @@ int main(int argc, char *argv[])
                                exit(1);
                        }
                        for (; array_list; array_list = array_list->next) {
-                               mdu_array_info_t array;
-                               mdfd = open_mddev(array_list->devname,
-                                                 array_list->autof ? array_list->autof : autof);
-                               if (mdfd < 0) {
-                                       rv |= 1;
+                               if (array_list->devname &&
+                                   strcasecmp(array_list->devname, "<ignore>") == 0)
                                        continue;
-                               }
-                               if (ioctl(mdfd, GET_ARRAY_INFO, &array)>=0)
-                                       /* already assembled, skip */
-                                       ;
-                               else {
-                                       rv |= Assemble(ss, array_list->devname, mdfd,
-                                                      array_list,
-                                                      NULL, NULL,
-                                                      readonly, runstop, NULL, homehost, verbose-quiet, force);
-                                       if (rv == 0) cnt++;
-                               }
-                               close(mdfd);
-                       }
-                       if (homehost) {
+                               if (array_list->autof == 0)
+                                       array_list->autof = autof;
+                               
+                               rv |= Assemble(ss, array_list->devname,
+                                              array_list,
+                                              NULL, NULL,
+                                              readonly, runstop, NULL,
+                                              homehost, require_homehost,
+                                              verbose-quiet, force);
+                               cnt++;
+                       }
+                       if (homehost && cnt == 0) {
                                /* Maybe we can auto-assemble something.
-                                * Repeatedly call Assemble in auto-assmble mode
+                                * Repeatedly call Assemble in auto-assemble mode
                                 * until it fails
                                 */
                                int rv2;
                                int acnt;
                                ident.autof = autof;
                                do {
+                                       mddev_dev_t devlist = conf_get_devs();
                                        acnt = 0;
                                        do {
-                                               rv2 = Assemble(ss, NULL, -1,
+                                               rv2 = Assemble(ss, NULL,
                                                               &ident,
-                                                              NULL, NULL,
-                                                              readonly, runstop, NULL, homehost, verbose-quiet, force);
+                                                              devlist, NULL,
+                                                              readonly, runstop, NULL,
+                                                              homehost, require_homehost,
+                                                              verbose-quiet, force);
                                                if (rv2==0) {
                                                        cnt++;
                                                        acnt++;
@@ -1075,10 +1157,12 @@ int main(int argc, char *argv[])
                                        do {
                                                acnt = 0;
                                                do {
-                                                       rv2 = Assemble(ss, NULL, -1,
+                                                       rv2 = Assemble(ss, NULL,
                                                                       &ident,
                                                                       NULL, NULL,
-                                                                      readonly, runstop, "homehost", homehost, verbose-quiet, force);
+                                                                      readonly, runstop, "homehost",
+                                                                      homehost, require_homehost,
+                                                                      verbose-quiet, force);
                                                        if (rv2==0) {
                                                                cnt++;
                                                                acnt++;
@@ -1090,7 +1174,8 @@ int main(int argc, char *argv[])
                                if (cnt == 0 && rv == 0) {
                                        fprintf(stderr, Name ": No arrays found in config file or automatically\n");
                                        rv = 1;
-                               }
+                               } else if (cnt)
+                                       rv = 0;
                        } else if (cnt == 0 && rv == 0) {
                                fprintf(stderr, Name ": No arrays found in config file\n");
                                rv = 1;
@@ -1104,6 +1189,11 @@ int main(int argc, char *argv[])
                        rv = 1;
                        break;
                }
+               if (raiddisks == 0) {
+                       fprintf(stderr, Name ": no raid-devices specified.\n");
+                       rv = 1;
+                       break;
+               }
 
                if (bitmap_file) {
                        if (strcmp(bitmap_file, "internal")==0) {
@@ -1112,9 +1202,10 @@ int main(int argc, char *argv[])
                                break;
                        }
                }
-               rv = Build(devlist->devname, mdfd, chunk, level, layout,
+               rv = Build(devlist->devname, chunk, level, layout,
                           raiddisks, devlist->next, assume_clean,
-                          bitmap_file, bitmap_chunk, write_behind, delay, verbose-quiet);
+                          bitmap_file, bitmap_chunk, write_behind,
+                          delay, verbose-quiet, autof, size);
                break;
        case CREATE:
                if (delay == 0) delay = DEFAULT_BITMAP_DELAY;
@@ -1123,14 +1214,19 @@ int main(int argc, char *argv[])
                        rv = 1;
                        break;
                }
+               if (raiddisks == 0) {
+                       fprintf(stderr, Name ": no raid-devices specified.\n");
+                       rv = 1;
+                       break;
+               }
 
-               rv = Create(ss, devlist->devname, mdfd, chunk, level, layout, size<0 ? 0 : size,
+               rv = Create(ss, devlist->devname, chunk, level, layout, size<0 ? 0 : size,
                            raiddisks, sparedisks, ident.name, homehost,
+                           ident.uuid_set ? ident.uuid : NULL,
                            devs_found-1, devlist->next, runstop, verbose-quiet, force, assume_clean,
-                           bitmap_file, bitmap_chunk, write_behind, delay);
+                           bitmap_file, bitmap_chunk, write_behind, delay, autof);
                break;
        case MISC:
-
                if (devmode == 'E') {
                        if (devlist == NULL && !scan) {
                                fprintf(stderr, Name ": No devices to examine\n");
@@ -1142,24 +1238,48 @@ int main(int argc, char *argv[])
                                fprintf(stderr, Name ": No devices listed in %s\n", configfile?configfile:DefaultConfFile);
                                exit(1);
                        }
-                       rv = Examine(devlist, scan?(verbose>1?0:verbose+1):brief, scan, SparcAdjust, ss, homehost);
+                       if (brief && verbose)
+                               brief = 2;
+                       rv = Examine(devlist, scan?(verbose>1?0:verbose+1):brief,
+                                    export, scan,
+                                    SparcAdjust, ss, homehost);
+               } else if (devmode == DetailPlatform) {
+                       rv = Detail_Platform(ss ? ss->ss : NULL, ss ? scan : 1, verbose);
                } else {
                        if (devlist == NULL) {
-                               if (devmode=='D' && scan) {
-                                       /* apply --detail to all devices in /proc/mdstat */
+                               if ((devmode=='D' || devmode == Waitclean) && scan) {
+                                       /* apply --detail or --wait-clean to
+                                        * all devices in /proc/mdstat
+                                        */
                                        struct mdstat_ent *ms = mdstat_read(0, 1);
                                        struct mdstat_ent *e;
+                                       struct map_ent *map = NULL;
+                                       int v = verbose>1?0:verbose+1;
+
                                        for (e=ms ; e ; e=e->next) {
-                                               char *name = get_md_name(e->devnum);
+                                               char *name;
+                                               struct map_ent *me;
+                                               me = map_by_devnum(&map, e->devnum);
+                                               if (me && me->path
+                                                   && strcmp(me->path, "/unknown") != 0)
+                                                       name = me->path;
+                                               else
+                                                       name = get_md_name(e->devnum);
 
                                                if (!name) {
                                                        fprintf(stderr, Name ": cannot find device file for %s\n",
                                                                e->dev);
                                                        continue;
                                                }
-                                               rv |= Detail(name, verbose>1?0:verbose+1, test, homehost);
+                                               if (devmode == 'D')
+                                                       rv |= Detail(name, v,
+                                                                    export, test,
+                                                                    homehost);
+                                               else
+                                                       rv |= WaitClean(name, v);
                                                put_md_name(name);
                                        }
+                                       free_mdstat(ms);
                                } else  if (devmode == 'S' && scan) {
                                        /* apply --stop to all devices in /proc/mdstat */
                                        /* Due to possible stacking of devices, repeat until
@@ -1192,6 +1312,7 @@ int main(int argc, char *argv[])
 
                                                        put_md_name(name);
                                                }
+                                               free_mdstat(ms);
                                        } while (!last && err);
                                        if (err) rv |= 1;
                                } else {
@@ -1202,13 +1323,21 @@ int main(int argc, char *argv[])
                        for (dv=devlist ; dv; dv=dv->next) {
                                switch(dv->disposition) {
                                case 'D':
-                                       rv |= Detail(dv->devname, brief?1+verbose:0, test, homehost); continue;
+                                       rv |= Detail(dv->devname,
+                                                    brief?1+verbose:0,
+                                                    export, test, homehost);
+                                       continue;
                                case 'K': /* Zero superblock */
-                                       rv |= Kill(dv->devname, force, quiet); continue;
+                                       rv |= Kill(dv->devname, force, quiet,0);
+                                       continue;
                                case 'Q':
                                        rv |= Query(dv->devname); continue;
                                case 'X':
                                        rv |= ExamineBitmap(dv->devname, brief, ss); continue;
+                               case 'W':
+                                       rv |= Wait(dv->devname); continue;
+                               case Waitclean:
+                                       rv |= WaitClean(dv->devname, verbose-quiet); continue;
                                }
                                mdfd = open_mddev(dv->devname, 1);
                                if (mdfd>=0) {
@@ -1245,8 +1374,30 @@ int main(int argc, char *argv[])
                break;
 
        case GROW:
+               if (array_size >= 0) {
+                       /* alway impose array size first, independent of
+                        * anything else
+                        */
+                       struct mdinfo sra;
+                       int err;
+                       sysfs_init(&sra, mdfd, 0);
+                       if (array_size == 0)
+                               err = sysfs_set_str(&sra, NULL, "array_size", "default");
+                       else
+                               err = sysfs_set_num(&sra, NULL, "array_size", array_size / 2);
+                       if (err < 0) {
+                               if (errno == E2BIG)
+                                       fprintf(stderr, Name ": --array-size setting"
+                                               " is too large.\n");
+                               else
+                                       fprintf(stderr, Name ": current kernel does"
+                                               " not support setting --array-size\n");
+                               rv = 1;
+                               break;
+                       }
+               }
                if (devs_found > 1) {
-                       
+
                        /* must be '-a'. */
                        if (size >= 0 || raiddisks) {
                                fprintf(stderr, Name ": --size, --raiddisks, and --add are exclusing in --grow mode\n");
@@ -1271,9 +1422,41 @@ int main(int argc, char *argv[])
                        if (delay == 0) delay = DEFAULT_BITMAP_DELAY;
                        rv = Grow_addbitmap(devlist->devname, mdfd, bitmap_file,
                                            bitmap_chunk, delay, write_behind, force);
-               } else
+               } else if (array_size < 0)
                        fprintf(stderr, Name ": no changes to --grow\n");
                break;
+       case INCREMENTAL:
+               if (rebuild_map) {
+                       RebuildMap();
+               }
+               if (scan) {
+                       if (runstop <= 0) {
+                               fprintf(stderr, Name
+                        ": --incremental --scan meaningless without --run.\n");
+                               break;
+                       }
+                       rv = IncrementalScan(verbose);
+               }
+               if (!devlist) {
+                       if (!rebuild_map && !scan) {
+                               fprintf(stderr, Name
+                                       ": --incremental requires a device.\n");
+                               rv = 1;
+                       }
+                       break;
+               }
+               if (devlist->next) {
+                       fprintf(stderr, Name
+                              ": --incremental can only handle one device.\n");
+                       rv = 1;
+                       break;
+               }
+               rv = Incremental(devlist->devname, verbose-quiet, runstop,
+                                ss, homehost, require_homehost, autof);
+               break;
+       case AUTODETECT:
+               autodetect();
+               break;
        }
        exit(rv);
 }