X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=mdadm.c;h=4d7025e3808971b4f04413f53a1e9d108b6efe94;hb=57632f4afb3588465454187ca6ab66ffb200b677;hp=05784e1d3be0873f1946a12d98b4e52f0f429f9b;hpb=7ef02d01432952ee677beca7b0f90b653b3d336b;p=thirdparty%2Fmdadm.git diff --git a/mdadm.c b/mdadm.c index 05784e1d..4d7025e3 100644 --- a/mdadm.c +++ b/mdadm.c @@ -1,7 +1,7 @@ /* * mdadm - manage Linux "md" devices aka RAID arrays. * - * Copyright (C) 2001-2002 Neil Brown + * Copyright (C) 2001-2006 Neil Brown * * * This program is free software; you can redistribute it and/or modify @@ -26,7 +26,7 @@ * Sydney, 2052 * Australia * - * Additions for bitmap and write-behind RAID options, Copyright (C) 2003-2004, + * Additions for bitmap and write-behind RAID options, Copyright (C) 2003-2004, * Paul Clements, SteelEye Technology, Inc. */ @@ -74,16 +74,23 @@ int main(int argc, char *argv[]) int brief = 0; int force = 0; int test = 0; + int export = 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,9 +102,12 @@ int main(int argc, char *argv[]) int re_add = 0; char *shortopt = short_options; int dosyslog = 0; + int rebuild_map = 0; + int auto_update_home = 0; int copies; int print_help = 0; + FILE *outf; int mdfd = -1; @@ -123,7 +133,7 @@ int main(int argc, char *argv[]) /* firstly, some mode-independant options */ switch(opt) { case 'h': - if (option_index > 0 && + if (option_index > 0 && strcmp(long_options[option_index].name, "help-options")==0) print_help = 2; else @@ -150,6 +160,13 @@ int main(int argc, char *argv[]) } continue; + case 'Y': export++; + continue; + + case HomeHost: + homehost = optarg; + continue; + case ':': case '?': fputs(Usage, stderr); @@ -157,21 +174,21 @@ int main(int argc, char *argv[]) } /* second, figure out the mode. * Some options force the mode. Others - * set the mode if it isn't already + * set the mode if it isn't already */ switch(opt) { case '@': /* just incase they say --manage */ newmode = MANAGE; - shortopt = short_bitmap_auto_options; + shortopt = short_bitmap_options; break; case 'a': case 'r': case 'f': - case 6: /* re-add */ + case ReAdd: /* re-add */ if (!mode) { newmode = MANAGE; - shortopt = short_bitmap_auto_options; + shortopt = short_bitmap_options; } break; @@ -179,7 +196,13 @@ int main(int argc, char *argv[]) case 'B': newmode = BUILD; shortopt = short_bitmap_auto_options; break; case 'C': newmode = CREATE; shortopt = short_bitmap_auto_options; break; case 'F': newmode = MONITOR;break; - case 'G': newmode = GROW; shortopt = short_bitmap_auto_options; break; + case 'G': newmode = GROW; + shortopt = short_bitmap_options; + break; + case 'I': newmode = INCREMENTAL; + shortopt = short_bitmap_auto_options; break; + case AutoDetect: + newmode = AUTODETECT; break; case '#': case 'D': @@ -190,6 +213,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) { @@ -209,10 +233,10 @@ int main(int argc, char *argv[]) mode = newmode; } else { /* special case of -c --help */ - if (opt == 'c' && + if (opt == 'c' && ( strncmp(optarg, "--h", 3)==0 || strncmp(optarg, "-h", 2)==0)) { - fputs(Help_config, stderr); + fputs(Help_config, stdout); exit(0); } @@ -228,10 +252,11 @@ 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; - + devs_found++; continue; } @@ -256,6 +281,8 @@ int main(int argc, char *argv[]) case 'C': case 'F': case 'G': + case 'I': + case AutoDetect: continue; } if (opt == 1) { @@ -281,7 +308,7 @@ int main(int argc, char *argv[]) dv->next = NULL; *devlistend = dv; devlistend = &dv->next; - + devs_found++; continue; } @@ -305,6 +332,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 */ @@ -312,7 +343,7 @@ int main(int argc, char *argv[]) fprintf(stderr, Name ": metadata information already given\n"); exit(2); } - for(i=0; !ss && superlist[i]; i++) + for(i=0; !ss && superlist[i]; i++) ss = superlist[i]->match_metadata_desc(optarg); if (!ss) { @@ -403,23 +434,25 @@ 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); @@ -436,8 +469,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; @@ -479,40 +512,15 @@ 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 = -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' */ @@ -524,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. " @@ -577,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; @@ -587,12 +596,18 @@ 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"); exit(2); } - for(i=0; !ss && superlist[i]; i++) + for(i=0; !ss && superlist[i]; i++) ss = superlist[i]->match_metadata_desc("0.swap"); if (!ss) { fprintf(stderr, Name ": INTERNAL ERROR cannot find 0.swap\n"); @@ -601,8 +616,25 @@ int main(int argc, char *argv[]) continue; } - fprintf(stderr, Name ": '--update %s' invalid. Only 'sparc2.2', 'super-minor', 'uuid', 'resync' or 'summaries' supported\n",update); - exit(2); + if (strcmp(update,"?") == 0 || + strcmp(update, "help") == 0) { + outf = stdout; + fprintf(outf, Name ": "); + } else { + outf = stderr; + fprintf(outf, + Name ": '--update=%s' is invalid. ", + update); + } + fprintf(outf, "Valid --update options are:\n" + " 'sparc2.2', 'super-minor', 'uuid', 'name', 'resync',\n" + " 'summaries', 'homehost', 'byteorder', 'devicesize'.\n"); + exit(outf == stdout ? 0 : 2); + + case O(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'): @@ -613,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; @@ -670,7 +704,7 @@ int main(int argc, char *argv[]) test = 1; continue; case O(MONITOR,'y'): /* log messages to syslog */ - openlog("mdadm", 0, SYSLOG_FACILITY); + openlog("mdadm", LOG_PID, SYSLOG_FACILITY); dosyslog = 1; continue; @@ -682,7 +716,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; @@ -692,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'): @@ -734,6 +769,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", @@ -746,7 +782,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); @@ -771,8 +807,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 */ @@ -783,9 +819,15 @@ int main(int argc, char *argv[]) backup_file = optarg; continue; - case O(GROW,'b'): case O(BUILD,'b'): case O(CREATE,'b'): /* here we create the bitmap */ + if (strcmp(optarg, "none") == 0) { + fprintf(stderr, Name ": '--bitmap none' only" + " support for --grow\n"); + exit(2); + } + /* FALL THROUGH */ + case O(GROW,'b'): if (strcmp(optarg, "internal")== 0 || strcmp(optarg, "none")== 0 || strchr(optarg, '/') != NULL) { @@ -796,9 +838,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)) { @@ -810,8 +852,9 @@ 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(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); @@ -822,6 +865,10 @@ int main(int argc, char *argv[]) } } continue; + + case O(INCREMENTAL, 'r'): + rebuild_map = 1; + continue; } /* We have now processed all the valid options. Anything else is * an error @@ -850,8 +897,9 @@ int main(int argc, char *argv[]) case MISC : help_text = Help_misc; break; case MONITOR : help_text = Help_monitor; break; case GROW : help_text = Help_grow; break; + case INCREMENTAL:help_text= Help_incr; break; } - fputs(help_text,stderr); + fputs(help_text,stdout); exit(0); } @@ -865,6 +913,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 @@ -882,9 +943,11 @@ 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); @@ -916,6 +979,15 @@ int main(int argc, char *argv[]) } } + if (homehost == NULL) + homehost = conf_get_homehost(); + if (homehost && strcmp(homehost, "")==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: @@ -928,33 +1000,33 @@ 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); rv |= 1; } else { - mdfd = open_mddev(devlist->devname, + 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, 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"); @@ -965,66 +1037,126 @@ 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); rv |= 1; continue; } - mdfd = open_mddev(dv->devname, + 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, 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"); 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) { @@ -1044,26 +1176,35 @@ int main(int argc, char *argv[]) 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, + 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, + export, scan, + SparcAdjust, ss, homehost); } else { if (devlist == NULL) { if (devmode=='D' && scan) { @@ -1078,7 +1219,8 @@ 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, + export, test, homehost); put_md_name(name); } } else if (devmode == 'S' && scan) { @@ -1102,9 +1244,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; @@ -1123,21 +1265,27 @@ 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, + export, test, homehost); + continue; case 'K': /* Zero superblock */ - rv |= Kill(dv->devname, force, quiet); continue; + rv |= Kill(dv->devname, force, quiet,0); + continue; case 'Q': rv |= Query(dv->devname); continue; case 'X': rv |= ExamineBitmap(dv->devname, brief, ss); continue; + case 'W': + rv |= Wait(dv->devname); continue; } - 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': @@ -1162,12 +1310,12 @@ 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: if (devs_found > 1) { - + /* must be '-a'. */ if (size >= 0 || raiddisks) { fprintf(stderr, Name ": --size, --raiddisks, and --add are exclusing in --grow mode\n"); @@ -1195,6 +1343,38 @@ 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); + break; + case AUTODETECT: + autodetect(); + break; } exit(rv); }