]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - mdadm.c
Stop managed arrays more carefully.
[thirdparty/mdadm.git] / mdadm.c
diff --git a/mdadm.c b/mdadm.c
index e18167375a2c6e720dcc1bbde48fb41a2149a31a..8b4b5dffbacceb81dbb05fb7e438ead3052abecc 100644 (file)
--- a/mdadm.c
+++ b/mdadm.c
@@ -1,7 +1,7 @@
 /*
  * mdadm - manage Linux "md" devices aka RAID arrays.
  *
- * Copyright (C) 2001-2002 Neil Brown <neilb@cse.unsw.edu.au>
+ * Copyright (C) 2001-2006 Neil Brown <neilb@suse.de>
  *
  *
  *    This program is free software; you can redistribute it and/or modify
@@ -25,6 +25,9 @@
  *           The University of New South Wales
  *           Sydney, 2052
  *           Australia
+ *
+ *    Additions for bitmap and write-behind RAID options, Copyright (C) 2003-2004,
+ *    Paul Clements, SteelEye Technology, Inc.
  */
 
 #include "mdadm.h"
 #include <ctype.h>
 
 
-void make_parts(char *dev, int cnt)
-{
-       /* make 'cnt' partition devices for 'dev'
-        * We use the major/minor from dev and add 1..cnt
-        * If dev ends with a digit, we add "_p%d" else "%d"
-        * If the name exists, we use it's owner/mode,
-        * else that of dev
-        */
-       struct stat stb;
-       int major, minor;
-       int i;
-       char *name = malloc(strlen(dev) + 20);
-       int dig = isdigit(dev[strlen(dev)-1]);
-
-       if (stat(dev, &stb)!= 0)
-               return;
-       if (!S_ISBLK(stb.st_mode))
-               return;
-       major = MAJOR(stb.st_rdev);
-       minor = MINOR(stb.st_rdev);
-       for (i=1; i <= cnt ; i++) {
-               struct stat stb2;
-               sprintf(name, "%s%s%d", dev, dig?"_p":"", i);
-               if (stat(name, &stb2)==0) {
-                       if (!S_ISBLK(stb2.st_mode))
-                               continue;
-                       if (stb2.st_rdev == MKDEV(major, minor+i))
-                               continue;
-                       unlink(name);
-               } else {
-                       stb2 = stb;
-               }
-               mknod(name, S_IFBLK | 0600, MKDEV(major, minor+i));
-               chown(name, stb2.st_uid, stb2.st_gid);
-               chmod(name, stb2.st_mode & 07777);
-       }
-}
-
-/*
- * Open a given md device, and check that it really is one.
- * If 'autof' is given, then we need to create, or recreate, the md device.
- * If the name already exists, and is not a block device, we fail.
- * If it exists and is not an md device, is not the right type (partitioned or not),
- * or is currently in-use, we remove the device, but remember the owner and mode.
- * If it now doesn't exist, we find a few md array and create the device.
- * Default ownership is user=0, group=0 perm=0600
- */
-int open_mddev(char *dev, int autof)
-{
-       int mdfd;
-       struct stat stb;
-       int major = MD_MAJOR;
-       int minor;
-       int must_remove = 0;
-       struct mdstat_ent *mdlist;
-       int num;
-
-       if (autof) {
-               /* autof is set, so we need to check that the name is ok,
-                * and possibly create one if not
-                */
-               stb.st_mode = 0;
-               if (lstat(dev, &stb)==0 && ! S_ISBLK(stb.st_mode)) {
-                       fprintf(stderr, Name ": %s is not a block device.\n",
-                               dev);
-                       return -1;
-               }
-               /* check major number is correct */
-               if (autof>0)
-                       major = get_mdp_major();
-               if (stb.st_mode && MAJOR(stb.st_rdev) != major)
-                       must_remove = 1;
-               if (stb.st_mode && !must_remove) {
-                       mdu_array_info_t array;
-                       /* looks ok, see if it is available */
-                       mdfd = open(dev, O_RDWR, 0);
-                       if (mdfd < 0) {
-                               fprintf(stderr, Name ": error opening %s: %s\n",
-                                       dev, strerror(errno));
-                               return -1;
-                       } else if (md_get_version(mdfd) <= 0) {
-                               fprintf(stderr, Name ": %s does not appear to be an md device\n",
-                                       dev);
-                               close(mdfd);
-                               return -1;
-                       }
-                       if (ioctl(mdfd, GET_ARRAY_INFO, &array)==0) {
-                               /* already active */
-                               must_remove = 1;
-                               close(mdfd);
-                       } else {
-                               if (autof > 0)
-                                       make_parts(dev, autof);
-                               return mdfd;
-                       }
-               }
-               /* Ok, need to find a minor that is not in use.
-                * Easiest to read /proc/mdstat, and hunt through for
-                * an unused number 
-                */
-               mdlist = mdstat_read(0);
-               for (num= (autof>0)?-1:0 ; ; num+= (autof>2)?-1:1) {
-                       struct mdstat_ent *me;
-                       for (me=mdlist; me; me=me->next)
-                               if (me->devnum == num)
-                                       break;
-                       if (!me) {
-                               /* doesn't exist if mdstat.
-                                * make sure it is new to /dev too
-                                */
-                               char *dn;
-                               if (autof > 0) 
-                                       minor = (-1-num) << MdpMinorShift;
-                               else
-                                       minor = num;
-                               dn = map_dev(major,minor);
-                               if (dn==NULL || is_standard(dn)) {
-                                       /* this number only used by a 'standard' name,
-                                        * so it is safe to use
-                                        */
-                                       break;
-                               }
-                       }
-               }
-               /* 'num' is the number to use, >=0 for md, <0 for mdp */
-               if (must_remove) {
-                       /* never remove a device name that ends /mdNN or /dNN,
-                        * that would be confusing 
-                        */
-                       if (is_standard(dev)) {
-                               fprintf(stderr, Name ": --auto refusing to remove %s as it looks like a standard name.\n",
-                                       dev);
-                               return -1;
-                       }
-                       unlink(dev);
-               }
-
-               if (mknod(dev, S_IFBLK|0600, MKDEV(major, minor))!= 0) {
-                       fprintf(stderr, Name ": failed to create %s\n", dev);
-                       return -1;
-               }
-               if (must_remove) {
-                       chown(dev, stb.st_uid, stb.st_gid);
-                       chmod(dev, stb.st_mode & 07777);
-               }
-               make_parts(dev,autof);
-       }
-       mdfd = open(dev, O_RDWR, 0);
-       if (mdfd < 0)
-               fprintf(stderr, Name ": error opening %s: %s\n",
-                       dev, strerror(errno));
-       else if (md_get_version(mdfd) <= 0) {
-               fprintf(stderr, Name ": %s does not appear to be an md device\n",
-                       dev);
-               close(mdfd);
-               mdfd = -1;
-       }
-       return mdfd;
-}
-
-
-
 int main(int argc, char *argv[])
 {
        int mode = 0;
        int opt;
        int option_index;
-       char *help_text;
        char *c;
        int rv;
+       int i;
 
        int chunk = 0;
-       int size = -1;
+       long long size = -1;
        int level = UnSet;
        int layout = UnSet;
        int raiddisks = 0;
+       int max_disks = MD_SB_DISKS; /* just a default */
        int sparedisks = 0;
        struct mddev_ident_s ident;
        char *configfile = NULL;
@@ -217,67 +59,112 @@ int main(int argc, char *argv[])
        char devmode = 0;
        int runstop = 0;
        int readonly = 0;
+       int write_behind = 0;
+       int bitmap_fd = -1;
+       char *bitmap_file = NULL;
+       char *backup_file = NULL;
+       int bitmap_chunk = UnSet;
        int SparcAdjust = 0;
        mddev_dev_t devlist = NULL;
        mddev_dev_t *devlistend = & devlist;
        mddev_dev_t dv;
        int devs_found = 0;
        int verbose = 0;
+       int quiet = 0;
        int brief = 0;
        int force = 0;
        int test = 0;
+       int export = 0;
        int assume_clean = 0;
-       int autof = 0; /* -1 for non-partitions, 1 or more to create partitions */
+       char *symlinks = NULL;
+       /* autof indicates whether and how to create device node.
+        * bottom 3 bits are style.  Rest (when shifted) are number of parts
+        * 0  - unset
+        * 1  - don't create (no)
+        * 2  - if is_standard, then create (yes)
+        * 3  - create as 'md' - reject is_standard mdp (md)
+        * 4  - create as 'mdp' - reject is_standard md (mdp)
+        * 5  - default to md if not is_standard (md in config file)
+        * 6  - default to mdp if not is_standard (part, or mdp in config file)
+        */
+       int autof = 0;
 
+       char *homehost = NULL;
+       char sys_hostname[256];
        char *mailaddr = NULL;
        char *program = NULL;
        int delay = 0;
        int daemonise = 0;
+       char *pidfile = NULL;
        int oneshot = 0;
+       struct supertype *ss = NULL;
+       int writemostly = 0;
+       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;
 
+       srandom(time(0) ^ getpid());
+
        ident.uuid_set=0;
        ident.level = UnSet;
        ident.raid_disks = UnSet;
        ident.super_minor= UnSet;
        ident.devices=0;
+       ident.spare_group = NULL;
+       ident.autof = 0;
+       ident.st = NULL;
+       ident.bitmap_fd = -1;
+       ident.bitmap_file = NULL;
+       ident.name[0] = 0;
 
        while ((option_index = -1) ,
               (opt=getopt_long(argc, argv,
-                               short_options, long_options,
+                               shortopt, long_options,
                                &option_index)) != -1) {
                int newmode = mode;
-               /* firstly, so mode-independant options */
+               /* firstly, some mode-independant options */
                switch(opt) {
                case 'h':
-                       help_text = Help;
-                       if (option_index > 0 && 
+                       if (option_index > 0 &&
                            strcmp(long_options[option_index].name, "help-options")==0)
-                               help_text = OptionHelp;
+                               print_help = 2;
                        else
-                               switch (mode) {
-                               case ASSEMBLE : help_text = Help_assemble; break;
-                               case BUILD    : help_text = Help_build; break;
-                               case CREATE   : help_text = Help_create; break;
-                               case MANAGE   : help_text = Help_manage; break;
-                               case MISC     : help_text = Help_misc; break;
-                               case MONITOR  : help_text = Help_monitor; break;
-                               case GROW     : help_text = Help_grow; break;
-                               }
-                       fputs(help_text,stderr);
-                       exit(0);
+                               print_help = 1;
+                       continue;
 
                case 'V':
                        fputs(Version, stderr);
                        exit(0);
 
-               case 'v': verbose = 1;
+               case 'v': verbose++;
                        continue;
 
-               case 'b': brief = 1;
+               case 'q': quiet++;
+                       continue;
+
+               case 'b':
+                       if (mode == ASSEMBLE || mode == BUILD || mode == CREATE || mode == GROW)
+                               break; /* b means bitmap */
+                       brief = 1;
+                       if (optarg) {
+                               fprintf(stderr, Name ": -b cannot have any extra immediately after it, sorry.\n");
+                               exit(2);
+                       }
+                       continue;
+
+               case 'Y': export++;
+                       continue;
+
+               case HomeHost:
+                       homehost = optarg;
                        continue;
 
                case ':':
@@ -287,31 +174,46 @@ 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; break;
+                       newmode = MANAGE;
+                       shortopt = short_bitmap_options;
+                       break;
                case 'a':
                case 'r':
                case 'f':
-               case 1 : if (!mode) newmode = MANAGE; break;
+               case ReAdd: /* re-add */
+                       if (!mode) {
+                               newmode = MANAGE;
+                               shortopt = short_bitmap_options;
+                       }
+                       break;
 
-               case 'A': newmode = ASSEMBLE; break;
-               case 'B': newmode = BUILD; break;
-               case 'C': newmode = CREATE; break;
+               case 'A': newmode = ASSEMBLE; shortopt = short_bitmap_auto_options; break;
+               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; 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':
                case 'E':
+               case 'X':
                case 'Q': newmode = MISC; break;
                case 'R':
                case 'S':
                case 'o':
                case 'w':
+               case 'W':
                case 'K': if (!mode) newmode = MISC; break;
                }
                if (mode && newmode == mode) {
@@ -323,7 +225,7 @@ int main(int argc, char *argv[])
                                fprintf(stderr, "--%s", long_options[option_index].name);
                        else
                                fprintf(stderr, "-%c", opt);
-                       fprintf(stderr, " would set mode to %s, but it is already %s.\n",
+                       fprintf(stderr, " would set mdadm mode to \"%s\", but it is already set to \"%s\".\n",
                                map_num(modes, newmode),
                                map_num(modes, mode));
                        exit(2);
@@ -331,17 +233,42 @@ 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);
                        }
+
+                       /* If first option is a device, don't force the mode yet */
+                       if (opt == 1) {
+                               if (devs_found == 0) {
+                                       dv = malloc(sizeof(*dv));
+                                       if (dv == NULL) {
+                                               fprintf(stderr, Name ": malloc failed\n");
+                                               exit(3);
+                                       }
+                                       dv->devname = optarg;
+                                       dv->disposition = devmode;
+                                       dv->writemostly = writemostly;
+                                       dv->re_add = re_add;
+                                       dv->used = 0;
+                                       dv->next = NULL;
+                                       *devlistend = dv;
+                                       devlistend = &dv->next;
+
+                                       devs_found++;
+                                       continue;
+                               }
+                               /* No mode yet, and this is the second device ... */
+                               fprintf(stderr, Name ": An option must be given to set the mode before a second device is listed\n");
+                               exit(2);
+                       }
                        if (option_index >= 0)
-                               fprintf(stderr, "--%s", long_options[option_index].name);
+                               fprintf(stderr, Name ": --%s", long_options[option_index].name);
                        else
-                               fprintf(stderr, "-%c", opt);
-                       fprintf(stderr, " does not set the mode, and so cannot be first.\n");
+                               fprintf(stderr, Name ": -%c", opt);
+                       fprintf(stderr, " does not set the mode, and so cannot be the first option.\n");
                        exit(2);
                }
 
@@ -354,6 +281,8 @@ int main(int argc, char *argv[])
                case 'C':
                case 'F':
                case 'G':
+               case 'I':
+               case AutoDetect:
                        continue;
                }
                if (opt == 1) {
@@ -374,10 +303,12 @@ int main(int argc, char *argv[])
                        }
                        dv->devname = optarg;
                        dv->disposition = devmode;
+                       dv->writemostly = writemostly;
+                       dv->re_add = re_add;
                        dv->next = NULL;
                        *devlistend = dv;
                        devlistend = &dv->next;
-                       
+
                        devs_found++;
                        continue;
                }
@@ -401,6 +332,34 @@ int main(int argc, char *argv[])
                        }
                        continue;
 
+               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 */
+                       if (ss) {
+                               fprintf(stderr, Name ": metadata information already given\n");
+                               exit(2);
+                       }
+                       for(i=0; !ss && superlist[i]; i++)
+                               ss = superlist[i]->match_metadata_desc(optarg);
+
+                       if (!ss) {
+                               fprintf(stderr, Name ": unrecognised metadata identifier: %s\n", optarg);
+                               exit(2);
+                       }
+                       max_disks = ss->max_devs;
+                       continue;
+
+               case O(MANAGE,'W'):
+               case O(BUILD,'W'):
+               case O(CREATE,'W'):
+                       /* set write-mostly for following devices */
+                       writemostly = 1;
+                       continue;
+
                case O(GROW,'z'):
                case O(CREATE,'z'): /* size */
                        if (size >= 0) {
@@ -411,7 +370,7 @@ int main(int argc, char *argv[])
                        if (strcmp(optarg, "max")==0)
                                size = 0;
                        else {
-                               size = strtol(optarg, &c, 10);
+                               size = strtoll(optarg, &c, 10);
                                if (!optarg[0] || *c || size < 4) {
                                        fprintf(stderr, Name ": invalid size: %s\n",
                                                optarg);
@@ -420,6 +379,7 @@ int main(int argc, char *argv[])
                        }
                        continue;
 
+               case O(GROW,'l'): /* hack - needed to understand layout */
                case O(CREATE,'l'):
                case O(BUILD,'l'): /* set raid level*/
                        if (level != UnSet) {
@@ -433,7 +393,7 @@ int main(int argc, char *argv[])
                                        optarg);
                                exit(2);
                        }
-                       if (level != 0 && level != -1 && level != 1 && level != -4 && mode == BUILD) {
+                       if (level != 0 && level != -1 && level != 1 && level != -4 && level != -5 && mode == BUILD) {
                                fprintf(stderr, Name ": Raid level %s not permitted with --build.\n",
                                        optarg);
                                exit(2);
@@ -447,6 +407,8 @@ int main(int argc, char *argv[])
                        continue;
 
                case O(CREATE,'p'): /* raid5 layout */
+               case O(BUILD,'p'): /* faulty layout */
+               case O(GROW, 'p'): /* faulty reconfig */
                        if (layout != UnSet) {
                                fprintf(stderr,Name ": layout may only be sent once.  "
                                        "Second value was %s\n", optarg);
@@ -472,24 +434,43 @@ int main(int argc, char *argv[])
                                break;
 
                        case 10:
-                               /* 'f' or 'n' followed by a number <= raid_disks */
-                               if ((optarg[0] !=  'n' && optarg[0] != 'f') ||
+                               /* '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) {
-                                       fprintf(stderr, Name ": layout for raid10 must be 'nNN' or 'fNN' where NN is a number, not %s\n", optarg);
+                                       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) {
+                                       fprintf(stderr, Name ": layout %s not understood for faulty.\n",
+                                               optarg);
+                                       exit(2);
+                               }
+                               layout = mode | (atoi(optarg+ln)<< ModeShift);
+                       }
                        }
                        continue;
 
-               case O(CREATE,3):
-               case O(BUILD,3): /* assume clean */
+               case O(CREATE,AssumeClean):
+               case O(BUILD,AssumeClean): /* assume clean */
                        assume_clean = 1;
                        continue;
 
@@ -502,17 +483,11 @@ int main(int argc, char *argv[])
                                exit(2);
                        }
                        raiddisks = strtol(optarg, &c, 10);
-                       if (!optarg[0] || *c || raiddisks<=0 || raiddisks > MD_SB_DISKS) {
+                       if (!optarg[0] || *c || raiddisks<=0) {
                                fprintf(stderr, Name ": invalid number of raid devices: %s\n",
                                        optarg);
                                exit(2);
                        }
-                       if (raiddisks == 1 &&  !force) {
-                               fprintf(stderr, Name ": '1' is an unusual number of drives for an array, so it is probably\n"
-                                       "     a mistake.  If you really mean it you will need to specify --force before\n"
-                                       "     setting the number of drives.\n");
-                               exit(2);
-                       }
                        ident.raid_disks = raiddisks;
                        continue;
 
@@ -528,7 +503,7 @@ int main(int argc, char *argv[])
                                exit(2);
                        }
                        sparedisks = strtol(optarg, &c, 10);
-                       if (!optarg[0] || *c || sparedisks < 0 || sparedisks > MD_SB_DISKS - raiddisks) {
+                       if (!optarg[0] || *c || sparedisks < 0) {
                                fprintf(stderr, Name ": invalid number of spare-devices: %s\n",
                                        optarg);
                                exit(2);
@@ -537,41 +512,19 @@ 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 */
-                       if (optarg == NULL)
-                               autof = -1;
-                       else if (strcasecmp(optarg,"no")==0)
-                               autof = 0;
-                       else if (strcasecmp(optarg,"yes")==0 || strcasecmp(optarg,"md")==0)
-                               autof = -1;
-                       else {
-                               /* There might be digits, and maybe a hypen, at the end */
-                               char *e = optarg + strlen(optarg);
-                               int num = 4;
-                               int len;
-                               while (e > optarg && isdigit(e[-1]))
-                                       e--;
-                               if (*e) {
-                                       num = atoi(e);
-                                       if (num <= 0) num = 1;
-                               }
-                               if (e > optarg && e[-1] == '-')
-                                       e--;
-                               len = e - optarg;
-                               if ((len == 3 && strncasecmp(optarg,"mdp",3)==0) ||
-                                   (len == 1 && strncasecmp(optarg,"p",1)==0) ||
-                                   (len >= 4 && strncasecmp(optarg,"part",4)==0))
-                                       autof = num;
-                               else {
-                                       fprintf(stderr, Name ": --auto flag arg of \"%s\" unrecognised: use no,yes,md,mdp,part\n"
-                                               "        optionally followed by a number.\n",
-                                               optarg);
-                                       exit(2);
-                               }
-                       }
+                       autof = parse_auto(optarg, "--auto flag", 0);
+                       continue;
+
+               case O(CREATE,Symlinks):
+               case O(BUILD,Symlinks):
+               case O(ASSEMBLE,Symlinks): /* auto creation of symlinks in /dev to /dev/md */
+                       symlinks = optarg;
                        continue;
 
                case O(BUILD,'f'): /* force honouring '-n 1' */
+               case O(GROW,'f'): /* ditto */
                case O(CREATE,'f'): /* force honouring of device list */
                case O(ASSEMBLE,'f'): /* force assembly */
                case O(MISC,'f'): /* force zero */
@@ -579,6 +532,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.  "
@@ -593,6 +547,21 @@ int main(int argc, char *argv[])
                        }
                        continue;
 
+               case O(CREATE,'N'):
+               case O(ASSEMBLE,'N'):
+                       if (ident.name[0]) {
+                               fprintf(stderr, Name ": name cannot be set twice.   "
+                                       "Second value %s.\n", optarg);
+                               exit(2);
+                       }
+                       if (strlen(optarg) > 32) {
+                               fprintf(stderr, Name ": name '%s' is too long, 32 chars max.\n",
+                                       optarg);
+                               exit(2);
+                       }
+                       strcpy(ident.name, optarg);
+                       continue;
+
                case O(ASSEMBLE,'m'): /* super-minor for array */
                        if (ident.super_minor != UnSet) {
                                fprintf(stderr, Name ": super-minor cannot be set twice.  "
@@ -617,7 +586,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;
@@ -625,8 +594,47 @@ int main(int argc, char *argv[])
                                continue;
                        if (strcmp(update, "resync")==0)
                                continue;
-                       fprintf(stderr, Name ": '--update %s' invalid.  Only 'sparc2.2', 'super-minor', 'resync' or 'summaries' supported\n",update);
-                       exit(2);
+                       if (strcmp(update, "uuid")==0)
+                               continue;
+                       if (strcmp(update, "name")==0)
+                               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++)
+                                       ss = superlist[i]->match_metadata_desc("0.swap");
+                               if (!ss) {
+                                       fprintf(stderr, Name ": INTERNAL ERROR cannot find 0.swap\n");
+                                       exit(2);
+                               }
+
+                               continue;
+                       }
+                       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(ASSEMBLE,NoDegraded): /* --no-degraded */
+                       runstop = -1; /* --stop isn't allowed for --assemble,
+                                      * so we overload slightly */
+                       continue;
 
                case O(ASSEMBLE,'c'): /* config file */
                case O(MISC, 'c'):
@@ -637,11 +645,13 @@ int main(int argc, char *argv[])
                                exit(2);
                        }
                        configfile = optarg;
+                       set_conffile(configfile);
                        /* FIXME possibly check that config file exists.  Even parse it */
                        continue;
                case O(ASSEMBLE,'s'): /* scan */
                case O(MISC,'s'):
                case O(MONITOR,'s'):
+               case O(INCREMENTAL,'s'):
                        scan = 1;
                        continue;
 
@@ -662,6 +672,9 @@ int main(int argc, char *argv[])
                        continue;
 
                case O(MONITOR,'d'): /* delay in seconds */
+               case O(GROW, 'd'):
+               case O(BUILD,'d'): /* delay for bitmap updates */
+               case O(CREATE,'d'):
                        if (delay)
                                fprintf(stderr, Name ": only specify delay once. %s ignored.\n",
                                        optarg);
@@ -677,12 +690,23 @@ int main(int argc, char *argv[])
                case O(MONITOR,'f'): /* daemonise */
                        daemonise = 1;
                        continue;
+               case O(MONITOR,'i'): /* pid */
+                       if (pidfile)
+                               fprintf(stderr, Name ": only specify one pid file. %s ignored.\n",
+                                       optarg);
+                       else
+                               pidfile = optarg;
+                       continue;
                case O(MONITOR,'1'): /* oneshot */
                        oneshot = 1;
                        continue;
                case O(MONITOR,'t'): /* test */
                        test = 1;
                        continue;
+               case O(MONITOR,'y'): /* log messages to syslog */
+                       openlog("mdadm", LOG_PID, SYSLOG_FACILITY);
+                       dosyslog = 1;
+                       continue;
 
                        /* now the general management options.  Some are applicable
                         * to other modes. None have arguments.
@@ -690,6 +714,11 @@ int main(int argc, char *argv[])
                case O(GROW,'a'):
                case O(MANAGE,'a'): /* add a drive */
                        devmode = 'a';
+                       re_add = 0;
+                       continue;
+               case O(MANAGE,ReAdd):
+                       devmode = 'a';
+                       re_add = 1;
                        continue;
                case O(MANAGE,'r'): /* remove a drive */
                        devmode = 'r';
@@ -697,6 +726,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'):
@@ -736,8 +766,10 @@ int main(int argc, char *argv[])
                case O(MISC,'K'):
                case O(MISC,'R'):
                case O(MISC,'S'):
+               case O(MISC,'X'):
                case O(MISC,'o'):
                case O(MISC,'w'):
+               case O(MISC,'W'):
                        if (devmode && devmode != opt &&
                            (devmode == 'E' || (opt == 'E' && devmode != 'Q'))) {
                                fprintf(stderr, Name ": --examine/-E cannot be given with -%c\n",
@@ -750,27 +782,150 @@ int main(int argc, char *argv[])
                        test = 1;
                        continue;
 
-               case O(MISC, 22):
+               case O(MISC, Sparc22):
                        if (devmode != 'E') {
                                fprintf(stderr, Name ": --sparc2.2 only allowed with --examine\n");
                                exit(2);
                        }
                        SparcAdjust = 1;
                        continue;
+
+               case O(ASSEMBLE,'b'): /* here we simply set the bitmap file */
+                       if (!optarg) {
+                               fprintf(stderr, Name ": bitmap file needed with -b in --assemble mode\n");
+                               exit(2);
+                       }
+                       if (strcmp(optarg, "internal")==0) {
+                               fprintf(stderr, Name ": there is no need to specify --bitmap when assembling arrays with internal bitmaps\n");
+                               continue;
+                       }
+                       bitmap_fd = open(optarg, O_RDWR);
+                       if (!*optarg || bitmap_fd < 0) {
+                               fprintf(stderr, Name ": cannot open bitmap file %s: %s\n", optarg, strerror(errno));
+                               exit(2);
+                       }
+                       ident.bitmap_fd = bitmap_fd; /* for Assemble */
+                       continue;
+
+               case O(ASSEMBLE, BackupFile):
+               case O(GROW, BackupFile):
+                       /* Specify a file into which grow might place a backup,
+                        * or from which assemble might recover a backup
+                        */
+                       if (backup_file) {
+                               fprintf(stderr, Name ": backup file already specified, rejecting %s\n", optarg);
+                               exit(2);
+                       }
+                       backup_file = optarg;
+                       continue;
+
+               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) {
+                               bitmap_file = optarg;
+                               continue;
+                       }
+                       /* probable typo */
+                       fprintf(stderr, Name ": bitmap file must contain a '/', or be 'internal', or 'none'\n");
+                       exit(2);
+
+               case O(GROW,BitmapChunk):
+               case O(BUILD,BitmapChunk):
+               case O(CREATE,BitmapChunk): /* bitmap chunksize */
+                       bitmap_chunk = strtol(optarg, &c, 10);
+                       if (!optarg[0] || *c || bitmap_chunk < 0 ||
+                                       bitmap_chunk & (bitmap_chunk - 1)) {
+                               fprintf(stderr, Name ": invalid bitmap chunksize: %s\n",
+                                               optarg);
+                               exit(2);
+                       }
+                       /* convert K to B, chunk of 0K means 512B */
+                       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;
+                       if (optarg) {
+                               write_behind = strtol(optarg, &c, 10);
+                               if (write_behind < 0 || *c ||
+                                   write_behind > 16383) {
+                                       fprintf(stderr, Name ": Invalid value for maximum outstanding write-behind writes: %s.\n\tMust be between 0 and 16383.\n", optarg);
+                                       exit(2);
+                               }
+                       }
+                       continue;
+
+               case O(INCREMENTAL, 'r'):
+                       rebuild_map = 1;
+                       continue;
                }
                /* We have now processed all the valid options. Anything else is
                 * an error
                 */
-               fprintf(stderr, Name ": option %c not valid in %s mode\n",
-                       opt, map_num(modes, mode));
+               if (option_index > 0)
+                       fprintf(stderr, Name ":option --%s not valid in %s mode\n",
+                               long_options[option_index].name,
+                               map_num(modes, mode));
+               else
+                       fprintf(stderr, Name ": option -%c not valid in %s mode\n",
+                               opt, map_num(modes, mode));
                exit(2);
 
        }
 
+       if (print_help) {
+               char *help_text = Help;
+               if (print_help == 2)
+                       help_text = OptionHelp;
+               else
+                       switch (mode) {
+                       case ASSEMBLE : help_text = Help_assemble; break;
+                       case BUILD    : help_text = Help_build; break;
+                       case CREATE   : help_text = Help_create; break;
+                       case MANAGE   : help_text = Help_manage; break;
+                       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,stdout);
+               exit(0);
+       }
+
+       if (!mode && devs_found) {
+               mode = MISC;
+               devmode = 'Q';
+               if (devlist->disposition == 0)
+                       devlist->disposition = devmode;
+       }
        if (!mode) {
                fputs(Usage, stderr);
                exit(2);
        }
+
+       if (symlinks) {
+               struct createinfo *ci = conf_get_create_info();
+
+               if (strcasecmp(symlinks, "yes") == 0)
+                       ci->symlinks = 1;
+               else if (strcasecmp(symlinks, "no") == 0)
+                       ci->symlinks = 0;
+               else {
+                       fprintf(stderr, Name ": option --symlinks must be 'no' or 'yes'\n");
+                       exit(2);
+               }
+       }
        /* Ok, got the option parsing out of the way
         * hopefully it's mostly right but there might be some stuff
         * missing
@@ -788,16 +943,48 @@ 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)
                        exit(1);
                if ((int)ident.super_minor == -2) {
                        struct stat stb;
                        fstat(mdfd, &stb);
-                       ident.super_minor = MINOR(stb.st_rdev);
+                       ident.super_minor = minor(stb.st_rdev);
+               }
+       }
+
+       if (raiddisks) {
+               if (raiddisks > max_disks) {
+                       fprintf(stderr, Name ": invalid number of raid devices: %d\n",
+                               raiddisks);
+                       exit(2);
+               }
+               if (raiddisks == 1 &&  !force && level != -5) {
+                       fprintf(stderr, Name ": '1' is an unusual number of drives for an array, so it is probably\n"
+                               "     a mistake.  If you really mean it you will need to specify --force before\n"
+                               "     setting the number of drives.\n");
+                       exit(2);
+               }
+       }
+       if (sparedisks) {
+               if ( sparedisks > max_disks - raiddisks) {
+                       fprintf(stderr, Name ": invalid number of spare-devices: %d\n",
+                               sparedisks);
+                       exit(2);
+               }
+       }
+
+       if (homehost == NULL)
+               homehost = conf_get_homehost();
+       if (homehost && strcmp(homehost, "<system>")==0) {
+               if (gethostname(sys_hostname, sizeof(sys_hostname)) == 0) {
+                       sys_hostname[sizeof(sys_hostname)-1] = 0;
+                       homehost = sys_hostname;
                }
        }
 
@@ -809,107 +996,222 @@ int main(int argc, char *argv[])
                        rv = Manage_ro(devlist->devname, mdfd, readonly);
                if (!rv && devs_found>1)
                        rv = Manage_subdevs(devlist->devname, mdfd,
-                                           devlist->next);
+                                           devlist->next, verbose-quiet);
                if (!rv && readonly < 0)
                        rv = Manage_ro(devlist->devname, mdfd, readonly);
                if (!rv && runstop)
-                       rv = Manage_runstop(devlist->devname, mdfd, runstop);
+                       rv = Manage_runstop(devlist->devname, mdfd, runstop, quiet);
                break;
        case ASSEMBLE:
                if (devs_found == 1 && ident.uuid_set == 0 &&
-                   ident.super_minor == UnSet && !scan ) {
+                   ident.super_minor == UnSet && ident.name[0] == 0 && !scan ) {
                        /* Only a device has been given, so get details from config file */
-                       mddev_ident_t array_ident = conf_get_ident(configfile, devlist->devname);
-                       mdfd = open_mddev(devlist->devname, array_ident->autof);
-                       if (mdfd < 0)
+                       mddev_ident_t array_ident = conf_get_ident(devlist->devname);
+                       if (array_ident == NULL) {
+                               fprintf(stderr, Name ": %s not identified in config file.\n",
+                                       devlist->devname);
                                rv |= 1;
-                       else {
-                               if (array_ident == NULL) {
-                                       fprintf(stderr, Name ": %s not identified in config file.\n",
-                                               devlist->devname);
+                       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);
+                                       close(mdfd);
                                }
-                               else 
-                                       rv |= Assemble(devlist->devname, mdfd, array_ident, configfile,
-                                                      NULL,
-                                                      readonly, runstop, update, verbose, force);
                        }
                } else if (!scan)
-                       rv = Assemble(devlist->devname, mdfd, &ident, configfile,
-                                     devlist->next,
-                                     readonly, runstop, update, verbose, force);
+                       rv = Assemble(ss, devlist->devname, mdfd, &ident,
+                                     devlist->next, backup_file,
+                                     readonly, runstop, update, 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");
                                exit(1);
                        }
+                       if (backup_file && devs_found > 1) {
+                               fprintf(stderr, Name ": can only assemble a single array when providing a backup file.\n");
+                               exit(1);
+                       }
                        for (dv = devlist ; dv ; dv=dv->next) {
-                               mddev_ident_t array_ident = conf_get_ident(configfile, dv->devname);
-                               mdfd = open_mddev(dv->devname, array_ident->autof);
-                               if (mdfd < 0) {
-                                       rv |= 1;
-                                       continue;
-                               }
+                               mddev_ident_t array_ident = conf_get_ident(dv->devname);
                                if (array_ident == NULL) {
                                        fprintf(stderr, Name ": %s not identified in config file.\n",
                                                dv->devname);
                                        rv |= 1;
                                        continue;
                                }
-                               rv |= Assemble(dv->devname, mdfd, array_ident, configfile,
-                                              NULL,
-                                              readonly, runstop, update, verbose, force);
+                               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,
+                                              NULL, backup_file,
+                                              readonly, runstop, update, homehost, verbose-quiet, force);
+                               close(mdfd);
                        }
                } else {
-                       mddev_ident_t array_list =  conf_get_ident(configfile, NULL);
-                       if (!array_list) {
+                       mddev_ident_t array_list =  conf_get_ident(NULL);
+                       mddev_dev_t devlist = conf_get_devs();
+                       int cnt = 0;
+                       if (devlist == NULL) {
+                               fprintf(stderr, Name ": No devices listed in conf file were found.\n");
+                               exit(1);
+                       }
+                       if (update) {
+                               fprintf(stderr, Name ": --update not meaningful with a --scan assembly.\n");
+                               exit(1);
+                       }
+                       if (backup_file) {
+                               fprintf(stderr, Name ": --backup_file not meaningful with a --scan assembly.\n");
+                               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;
+                                       continue;
+                               }
+                               if (ioctl(mdfd, GET_ARRAY_INFO, &array)>=0)
+                                       /* already assembled, skip */
+                                       cnt++;
+                               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) {
+                               /* Maybe we can auto-assemble something.
+                                * Repeatedly call Assemble in auto-assmble 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,
+                                                              &ident,
+                                                              devlist, NULL,
+                                                              readonly, runstop, NULL, homehost, verbose-quiet, force);
+                                               if (rv2==0) {
+                                                       cnt++;
+                                                       acnt++;
+                                               }
+                                               if (rv2 == 1)
+                                                       /* found something so even though assembly failed  we
+                                                        * want to avoid auto-updates
+                                                        */
+                                                       auto_update_home = 0;
+                                       } while (rv2!=2);
+                                       /* Incase there are stacked devices, we need to go around again */
+                               } while (acnt);
+                               if (cnt == 0 && auto_update_home && homehost) {
+                                       /* Nothing found, maybe we need to bootstrap homehost info */
+                                       do {
+                                               acnt = 0;
+                                               do {
+                                                       rv2 = Assemble(ss, NULL, -1,
+                                                                      &ident,
+                                                                      NULL, NULL,
+                                                                      readonly, runstop, "homehost", homehost, verbose-quiet, force);
+                                                       if (rv2==0) {
+                                                               cnt++;
+                                                               acnt++;
+                                                       }
+                                               } while (rv2!=2);
+                                               /* Incase there are stacked devices, we need to go around again */
+                                       } while (acnt);
+                               }
+                               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;
-                       } else
-                               for (; array_list; array_list = array_list->next) {
-                                       mdu_array_info_t array;
-                                       mdfd = open_mddev(array_list->devname, array_list->autof);
-                                       if (mdfd < 0) {
-                                               rv |= 1;
-                                               continue;
-                                       }
-                                       if (ioctl(mdfd, GET_ARRAY_INFO, &array)>=0)
-                                               /* already assembled, skip */
-                                               continue;
-                                       rv |= Assemble(array_list->devname, mdfd,
-                                                      array_list, configfile,
-                                                      NULL,
-                                                      readonly, runstop, NULL, verbose, force);
-                               }
+                       }
                }
                break;
        case BUILD:
-               rv = Build(devlist->devname, mdfd, chunk, level, raiddisks, devlist->next, assume_clean);
+               if (delay == 0) delay = DEFAULT_BITMAP_DELAY;
+               if (write_behind && !bitmap_file) {
+                       fprintf(stderr, Name ": write-behind mode requires a bitmap.\n");
+                       rv = 1;
+                       break;
+               }
+               if (raiddisks == 0) {
+                       fprintf(stderr, Name ": no raid-disks specified.\n");
+                       rv = 1;
+                       break;
+               }
+
+               if (bitmap_file) {
+                       if (strcmp(bitmap_file, "internal")==0) {
+                               fprintf(stderr, Name ": 'internal' bitmaps not supported with --build\n");
+                               rv |= 1;
+                               break;
+                       }
+               }
+               rv = Build(devlist->devname, mdfd, chunk, level, layout,
+                          raiddisks, devlist->next, assume_clean,
+                          bitmap_file, bitmap_chunk, write_behind, delay, verbose-quiet);
                break;
        case CREATE:
-               rv = Create(devlist->devname, mdfd, chunk, level, layout, size<0 ? 0 : size,
-                           raiddisks, sparedisks,
-                           devs_found-1, devlist->next, runstop, verbose, force);
+               if (delay == 0) delay = DEFAULT_BITMAP_DELAY;
+               if (write_behind && !bitmap_file) {
+                       fprintf(stderr, Name ": write-behind mode requires a bitmap.\n");
+                       rv = 1;
+                       break;
+               }
+               if (raiddisks == 0) {
+                       fprintf(stderr, Name ": no raid-disks specified.\n");
+                       rv = 1;
+                       break;
+               }
+
+               rv = Create(ss, devlist->devname, mdfd, 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);
                break;
        case MISC:
-
                if (devmode == 'E') {
                        if (devlist == NULL && !scan) {
                                fprintf(stderr, Name ": No devices to examine\n");
                                exit(2);
                        }
                        if (devlist == NULL)
-                               devlist = conf_get_devs(configfile);
+                               devlist = conf_get_devs();
                        if (devlist == NULL) {
                                fprintf(stderr, Name ": No devices listed in %s\n", configfile?configfile:DefaultConfFile);
                                exit(1);
                        }
-                       rv = Examine(devlist, scan?!verbose:brief, scan, SparcAdjust);
+                       if (brief && verbose)
+                               brief = 2;
+                       rv = Examine(devlist, scan?(verbose>1?0:verbose+1):brief,
+                                    export, scan,
+                                    SparcAdjust, ss, homehost);
                } else {
                        if (devlist == NULL) {
-                               if ((devmode == 'S' ||devmode=='D') && scan) {
-                                       /* apply to all devices in /proc/mdstat */
-                                       struct mdstat_ent *ms = mdstat_read(0);
+                               if (devmode=='D' && scan) {
+                                       /* apply --detail to all devices in /proc/mdstat */
+                                       struct mdstat_ent *ms = mdstat_read(0, 1);
                                        struct mdstat_ent *e;
                                        for (e=ms ; e ; e=e->next) {
                                                char *name = get_md_name(e->devnum);
@@ -919,16 +1221,45 @@ int main(int argc, char *argv[])
                                                                e->dev);
                                                        continue;
                                                }
-                                               if (devmode == 'D')
-                                                       rv |= Detail(name, !verbose, test);
-                                               else if (devmode=='S') {
-                                                       mdfd = open_mddev(name, 0);
-                                                       if (mdfd >= 0)
-                                                               rv |= Manage_runstop(name, mdfd, -1);
-                                               }
+                                               rv |= Detail(name, verbose>1?0:verbose+1,
+                                                            export, test, homehost);
                                                put_md_name(name);
                                        }
-                               } else {                                                
+                               } else  if (devmode == 'S' && scan) {
+                                       /* apply --stop to all devices in /proc/mdstat */
+                                       /* Due to possible stacking of devices, repeat until
+                                        * nothing more can be stopped
+                                        */
+                                       int progress=1, err;
+                                       int last = 0;
+                                       do {
+                                               struct mdstat_ent *ms = mdstat_read(0, 0);
+                                               struct mdstat_ent *e;
+
+                                               if (!progress) last = 1;
+                                               progress = 0; err = 0;
+                                               for (e=ms ; e ; e=e->next) {
+                                                       char *name = get_md_name(e->devnum);
+
+                                                       if (!name) {
+                                                               fprintf(stderr, Name ": cannot find device file for %s\n",
+                                                                       e->dev);
+                                                               continue;
+                                                       }
+                                                       mdfd = open_mddev(name, 1);
+                                                       if (mdfd >= 0) {
+                                                               if (Manage_runstop(name, mdfd, -1, quiet?1:last?0:-1))
+                                                                       err = 1;
+                                                               else
+                                                                       progress = 1;
+                                                               close(mdfd);
+                                                       }
+
+                                                       put_md_name(name);
+                                               }
+                                       } while (!last && err);
+                                       if (err) rv |= 1;
+                               } else {
                                        fprintf(stderr, Name ": No devices given.\n");
                                        exit(2);
                                }
@@ -936,24 +1267,35 @@ int main(int argc, char *argv[])
                        for (dv=devlist ; dv; dv=dv->next) {
                                switch(dv->disposition) {
                                case 'D':
-                                       rv |= Detail(dv->devname, brief, test); continue;
+                                       rv |= Detail(dv->devname,
+                                                    brief?1+verbose:0,
+                                                    export, test, homehost);
+                                       continue;
                                case 'K': /* Zero superblock */
-                                       rv |= Kill(dv->devname, force); 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;
                                }
-                               mdfd = open_mddev(dv->devname, 0);
-                               if (mdfd>=0)
+                               mdfd = open_mddev(dv->devname, 1);
+                               if (mdfd>=0) {
                                        switch(dv->disposition) {
                                        case 'R':
-                                               rv |= Manage_runstop(dv->devname, mdfd, 1); break;
+                                               rv |= Manage_runstop(dv->devname, mdfd, 1, quiet); break;
                                        case 'S':
-                                               rv |= Manage_runstop(dv->devname, mdfd, -1); break;
+                                               rv |= Manage_runstop(dv->devname, mdfd, -1, quiet); break;
                                        case 'o':
                                                rv |= Manage_ro(dv->devname, mdfd, 1); break;
                                        case 'w':
                                                rv |= Manage_ro(dv->devname, mdfd, -1); break;
                                        }
+                                       close(mdfd);
+                               } else
+                                       rv |= 1;
                        }
                }
                break;
@@ -963,13 +1305,19 @@ int main(int argc, char *argv[])
                        rv = 1;
                        break;
                }
+               if (pidfile && !daemonise) {
+                       fprintf(stderr, Name ": Cannot write a pid file when not in daemon mode\n");
+                       rv = 1;
+                       break;
+               }
                rv= Monitor(devlist, mailaddr, program,
-                           delay?delay:60, daemonise, scan, oneshot, configfile, test);
+                           delay?delay:60, daemonise, scan, oneshot,
+                           dosyslog, test, pidfile);
                break;
 
        case GROW:
                if (devs_found > 1) {
-                       
+
                        /* must be '-a'. */
                        if (size >= 0 || raiddisks) {
                                fprintf(stderr, Name ": --size, --raiddisks, and --add are exclusing in --grow mode\n");
@@ -981,12 +1329,53 @@ int main(int argc, char *argv[])
                                if (rv)
                                        break;
                        }
-               } else if (size >= 0 && raiddisks) {
-                       fprintf(stderr, Name ": can only grow size OR raiddisks, not both\n");
+               } else if ((size >= 0) + (raiddisks != 0) +  (layout != UnSet) + (bitmap_file != NULL)> 1) {
+                       fprintf(stderr, Name ": can change at most one of size, raiddisks, bitmap, and layout\n");
+                       rv = 1;
+                       break;
+               } else if (layout != UnSet)
+                       rv = Manage_reconfig(devlist->devname, mdfd, layout);
+               else if (size >= 0 || raiddisks)
+                       rv = Grow_reshape(devlist->devname, mdfd, quiet, backup_file,
+                                         size, level, layout, chunk, raiddisks);
+               else if (bitmap_file) {
+                       if (delay == 0) delay = DEFAULT_BITMAP_DELAY;
+                       rv = Grow_addbitmap(devlist->devname, mdfd, bitmap_file,
+                                           bitmap_chunk, delay, write_behind, force);
+               } else
+                       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;
-               } else 
-                       rv = Manage_resize(devlist->devname, mdfd, size, raiddisks);
+               }
+               rv = Incremental(devlist->devname, verbose-quiet, runstop,
+                                ss, homehost, autof);
+               break;
+       case AUTODETECT:
+               autodetect();
                break;
        }
        exit(rv);