]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - mdadm.c
Add new mode: --incremental
[thirdparty/mdadm.git] / mdadm.c
diff --git a/mdadm.c b/mdadm.c
index f31047476eec0478294059ad63ef40c2a152c533..9bec29589c6291ae9af9e7df91df174f83c36e9a 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
@@ -75,15 +75,21 @@ int main(int argc, char *argv[])
        int force = 0;
        int test = 0;
        int assume_clean = 0;
-       int autof = 0; /* -2 means create device based on name:
-                       *    if it ends mdN, then non-partitioned array N
-                       *    if it ends dN, then partitions array N
-                       * -1 means create non-partitioned, choose N
-                       *  1 or more to create partitioned
-                       * If -1 or 1 and name is a 'standard' name, then
-                       * insist on a match of type and number.
-                       */
+       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;
@@ -95,6 +101,8 @@ 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;
@@ -150,6 +158,10 @@ int main(int argc, char *argv[])
                        }
                        continue;
 
+               case HomeHost:
+                       homehost = optarg;
+                       continue;
+
                case ':':
                case '?':
                        fputs(Usage, stderr);
@@ -168,7 +180,7 @@ int main(int argc, char *argv[])
                case 'a':
                case 'r':
                case 'f':
-               case 6: /* re-add */
+               case ReAdd: /* re-add */
                        if (!mode) {
                                newmode = MANAGE;
                                shortopt = short_bitmap_auto_options;
@@ -180,6 +192,7 @@ int main(int argc, char *argv[])
                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 'I': newmode = INCREMENTAL; break;
 
                case '#':
                case 'D':
@@ -190,6 +203,7 @@ int main(int argc, char *argv[])
                case 'S':
                case 'o':
                case 'w':
+               case 'W':
                case 'K': if (!mode) newmode = MISC; break;
                }
                if (mode && newmode == mode) {
@@ -228,6 +242,7 @@ int main(int argc, char *argv[])
                                        dv->disposition = devmode;
                                        dv->writemostly = writemostly;
                                        dv->re_add = re_add;
+                                       dv->used = 0;
                                        dv->next = NULL;
                                        *devlistend = dv;
                                        devlistend = &dv->next;
@@ -256,6 +271,7 @@ int main(int argc, char *argv[])
                case 'C':
                case 'F':
                case 'G':
+               case 'I':
                        continue;
                }
                if (opt == 1) {
@@ -305,6 +321,10 @@ 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 */
@@ -438,8 +458,8 @@ int main(int argc, char *argv[])
                        }
                        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;
 
@@ -482,39 +502,13 @@ int main(int argc, char *argv[])
                case O(CREATE,'a'):
                case O(BUILD,'a'):
                case O(ASSEMBLE,'a'): /* auto-creation of device node */
-                       if (optarg == NULL)
-                               autof = -2;
-                       else if (strcasecmp(optarg,"no")==0)
-                               autof = 0;
-                       else if (strcasecmp(optarg,"yes")==0)
-                               autof = -2;
-                       else if (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' */
@@ -526,6 +520,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.  "
@@ -589,6 +584,12 @@ int main(int argc, char *argv[])
                                continue;
                        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");
@@ -603,9 +604,19 @@ 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);
+                       if (strcmp(update,"?") == 0 || strcmp(update, "help") == 0)
+                               fprintf(stderr, Name ": ");
+                       else
+                               fprintf(stderr, Name ": '--update=%s' is invalid.  ", update);
+                       fprintf(stderr, "Valid --update options are:\n"
+               "     'sparc2.2', 'super-minor', 'uuid', 'name', 'resync',\n"
+               "     'summaries', 'homehost', 'byteorder', 'devicesize'.\n");
                        exit(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'):
                case O(MONITOR,'c'):
@@ -615,11 +626,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;
 
@@ -684,7 +697,7 @@ int main(int argc, char *argv[])
                        devmode = 'a';
                        re_add = 0;
                        continue;
-               case O(MANAGE,6):
+               case O(MANAGE,ReAdd):
                        devmode = 'a';
                        re_add = 1;
                        continue;
@@ -694,6 +707,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,6 +750,7 @@ int main(int argc, char *argv[])
                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",
@@ -748,7 +763,7 @@ 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);
@@ -773,8 +788,8 @@ int main(int argc, char *argv[])
                        ident.bitmap_fd = bitmap_fd; /* for Assemble */
                        continue;
 
-               case O(ASSEMBLE, 7):
-               case O(GROW, 7):
+               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
                         */
@@ -798,9 +813,9 @@ int main(int argc, char *argv[])
                        fprintf(stderr, Name ": bitmap file must contain a '/', or be 'internal', or 'none'\n");
                        exit(2);
 
-               case O(GROW,4):
-               case O(BUILD,4):
-               case O(CREATE,4): /* bitmap chunksize */
+               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)) {
@@ -812,8 +827,8 @@ int main(int argc, char *argv[])
                        bitmap_chunk = bitmap_chunk ? bitmap_chunk * 1024 : 512;
                        continue;
 
-               case O(BUILD, 5):
-               case O(CREATE, 5): /* write-behind mode */
+               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);
@@ -824,6 +839,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
@@ -852,6 +871,7 @@ 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);
                exit(0);
@@ -867,6 +887,19 @@ int main(int argc, char *argv[])
                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
@@ -887,6 +920,8 @@ int main(int argc, char *argv[])
                        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);
@@ -918,6 +953,15 @@ int main(int argc, char *argv[])
                }
        }
 
+       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;
+               }
+       }
+
        rv = 0;
        switch(mode) {
        case MANAGE:
@@ -930,13 +974,13 @@ int main(int argc, char *argv[])
                if (!rv && readonly < 0)
                        rv = Manage_ro(devlist->devname, mdfd, readonly);
                if (!rv && runstop)
-                       rv = Manage_runstop(devlist->devname, mdfd, runstop, 0);
+                       rv = Manage_runstop(devlist->devname, mdfd, runstop, quiet);
                break;
        case ASSEMBLE:
                if (devs_found == 1 && ident.uuid_set == 0 &&
                    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);
+                       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);
@@ -947,16 +991,16 @@ int main(int argc, char *argv[])
                                if (mdfd < 0)
                                        rv |= 1;
                                else {
-                                       rv |= Assemble(ss, devlist->devname, mdfd, array_ident, configfile,
+                                       rv |= Assemble(ss, devlist->devname, mdfd, array_ident,
                                                       NULL, backup_file,
-                                                      readonly, runstop, update, verbose-quiet, force);
+                                                      readonly, runstop, update, homehost, verbose-quiet, force);
                                        close(mdfd);
                                }
                        }
                } else if (!scan)
-                       rv = Assemble(ss, devlist->devname, mdfd, &ident, configfile,
+                       rv = Assemble(ss, devlist->devname, mdfd, &ident,
                                      devlist->next, backup_file,
-                                     readonly, runstop, update, verbose-quiet, force);
+                                     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");
@@ -967,7 +1011,7 @@ int main(int argc, char *argv[])
                                exit(1);
                        }
                        for (dv = devlist ; dv ; dv=dv->next) {
-                               mddev_ident_t array_ident = conf_get_ident(configfile, dv->devname);
+                               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);
@@ -980,47 +1024,102 @@ int main(int argc, char *argv[])
                                        rv |= 1;
                                        continue;
                                }
-                               rv |= Assemble(ss, dv->devname, mdfd, array_ident, configfile,
+                               rv |= Assemble(ss, dv->devname, mdfd, array_ident,
                                               NULL, backup_file,
-                                              readonly, runstop, update, verbose-quiet, force);
+                                              readonly, runstop, update, homehost, verbose-quiet, force);
                                close(mdfd);
                        }
                } else {
-                       mddev_ident_t array_list =  conf_get_ident(configfile, NULL);
-                       if (!array_list) {
-                               fprintf(stderr, Name ": No arrays found in config file\n");
-                               rv = 1;
-                       } else
-                               if (update) {
-                                       fprintf(stderr, Name ": --update not meaningful with a --scan assembly.\n");
-                                       exit(1);
+                       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 (backup_file) {
-                                       fprintf(stderr, Name ": --backup_file not meaningful with a --scan assembly.\n");
-                                       exit(1);
+                               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++;
                                }
-                               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 */
-                                               ;
-                                       else
-                                               rv |= Assemble(ss, array_list->devname, mdfd,
-                                                              array_list, configfile,
+                               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 {
+                                       acnt = 0;
+                                       do {
+                                               rv2 = Assemble(ss, NULL, -1,
+                                                              &ident,
                                                               NULL, NULL,
-                                                              readonly, runstop, NULL, verbose-quiet, force);
-                                       close(mdfd);
+                                                              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 == 0 && rv == 0) {
+                               fprintf(stderr, Name ": No arrays found in config file\n");
+                               rv = 1;
+                       }
                }
                break;
        case BUILD:
-               if (bitmap_chunk == UnSet) bitmap_chunk = DEFAULT_BITMAP_CHUNK;
                if (delay == 0) delay = DEFAULT_BITMAP_DELAY;
                if (write_behind && !bitmap_file) {
                        fprintf(stderr, Name ": write-behind mode requires a bitmap.\n");
@@ -1048,24 +1147,26 @@ int main(int argc, char *argv[])
                }
 
                rv = Create(ss, devlist->devname, mdfd, chunk, level, layout, size<0 ? 0 : size,
-                           raiddisks, sparedisks, ident.name,
+                           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>1?0:verbose+1):brief, scan, SparcAdjust, ss);
+                       if (brief && verbose)
+                               brief = 2;
+                       rv = Examine(devlist, scan?(verbose>1?0:verbose+1):brief, scan, SparcAdjust, ss, homehost);
                } else {
                        if (devlist == NULL) {
                                if (devmode=='D' && scan) {
@@ -1080,7 +1181,7 @@ int main(int argc, char *argv[])
                                                                e->dev);
                                                        continue;
                                                }
-                                               rv |= Detail(name, verbose>1?0:verbose+1, test);
+                                               rv |= Detail(name, verbose>1?0:verbose+1, test, homehost);
                                                put_md_name(name);
                                        }
                                } else  if (devmode == 'S' && scan) {
@@ -1104,9 +1205,9 @@ int main(int argc, char *argv[])
                                                                        e->dev);
                                                                continue;
                                                        }
-                                                       mdfd = open_mddev(name, 0);
+                                                       mdfd = open_mddev(name, 1);
                                                        if (mdfd >= 0) {
-                                                               if (Manage_runstop(name, mdfd, -1, !last))
+                                                               if (Manage_runstop(name, mdfd, -1, quiet?1:last?0:-1))
                                                                        err = 1;
                                                                else
                                                                        progress = 1;
@@ -1125,21 +1226,23 @@ 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); continue;
+                                       rv |= Detail(dv->devname, brief?1+verbose:0, test, homehost); continue;
                                case 'K': /* Zero superblock */
                                        rv |= Kill(dv->devname, force, quiet); 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);
+                               mdfd = open_mddev(dv->devname, 1);
                                if (mdfd>=0) {
                                        switch(dv->disposition) {
                                        case 'R':
-                                               rv |= Manage_runstop(dv->devname, mdfd, 1, 0); break;
+                                               rv |= Manage_runstop(dv->devname, mdfd, 1, quiet); break;
                                        case 'S':
-                                               rv |= Manage_runstop(dv->devname, mdfd, -1, 0); break;
+                                               rv |= Manage_runstop(dv->devname, mdfd, -1, quiet); break;
                                        case 'o':
                                                rv |= Manage_ro(dv->devname, mdfd, 1); break;
                                        case 'w':
@@ -1164,7 +1267,7 @@ int main(int argc, char *argv[])
                }
                rv= Monitor(devlist, mailaddr, program,
                            delay?delay:60, daemonise, scan, oneshot,
-                           dosyslog, configfile, test, pidfile);
+                           dosyslog, test, pidfile);
                break;
 
        case GROW:
@@ -1197,6 +1300,34 @@ int main(int argc, char *argv[])
                } 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;
+               }
+               rv = Incremental(devlist->devname, verbose-quiet, runstop,
+                                ss, homehost, autof);
        }
        exit(rv);
 }