X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=mdadm.c;h=ff656e4122ded98049311f0fff9e4f902e87b27b;hp=d40008ea578d696857e372c887a0d9e1079469d9;hb=b3b33eb5cdf7190e1de195bc7429ea815f117f64;hpb=b5e64645037e99b5f05c9499b27b422ae60d23a9

diff --git a/mdadm.c b/mdadm.c
index d40008ea..ff656e41 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 <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"
@@ -32,21 +35,21 @@
 #include <ctype.h>
 
 
-
 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;
@@ -56,68 +59,104 @@ 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 assume_clean = 0;
-	int autof = 0; /* -1 for non-partitions, 1 or more to create partitions */
+	/* 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 copies;
+	int print_help = 0;
 
 	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 && 
 			    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 '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 'b': brief = 1;
+		case HomeHost:
+			homehost = optarg;
 			continue;
 
 		case ':':
@@ -132,21 +171,29 @@ int main(int argc, char *argv[])
 
 		switch(opt) {
 		case '@': /* just incase they say --manage */
-			newmode = MANAGE; break;
+			newmode = MANAGE;
+			shortopt = short_bitmap_auto_options;
+			break;
 		case 'a':
 		case 'r':
 		case 'f':
-		case 1 : if (!mode) newmode = MANAGE; break;
+		case 6: /* re-add */
+			if (!mode) {
+				newmode = MANAGE;
+				shortopt = short_bitmap_auto_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_auto_options; break;
 
 		case '#':
 		case 'D':
 		case 'E':
+		case 'X':
 		case 'Q': newmode = MISC; break;
 		case 'R':
 		case 'S':
@@ -163,7 +210,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);
@@ -177,11 +224,36 @@ int main(int argc, char *argv[])
 				fputs(Help_config, stderr);
 				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);
 		}
 
@@ -214,6 +286,8 @@ 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;
@@ -241,6 +315,30 @@ int main(int argc, char *argv[])
 			}
 			continue;
 
+		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) {
@@ -251,7 +349,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);
@@ -315,16 +413,18 @@ 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;
@@ -348,8 +448,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;
 
@@ -362,17 +462,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 && 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);
-			}
 			ident.raid_disks = raiddisks;
 			continue;
 
@@ -388,7 +482,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);
@@ -398,40 +492,11 @@ 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 = -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(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 */
@@ -453,6 +518,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.  "
@@ -485,9 +565,33 @@ 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);
+			if (strcmp(update, "uuid")==0)
+				continue;
+			if (strcmp(update, "name")==0)
+				continue;
+			if (strcmp(update, "homehost")==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;
+			}
+			fprintf(stderr, Name ": '--update %s' invalid.  Only 'sparc2.2', 'super-minor', 'uuid', 'resync' or 'summaries' supported\n",update);
 			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'):
@@ -522,6 +626,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);
@@ -550,6 +657,10 @@ int main(int argc, char *argv[])
 		case O(MONITOR,'t'): /* test */
 			test = 1;
 			continue;
+		case O(MONITOR,'y'): /* log messages to syslog */
+			openlog("mdadm", 0, SYSLOG_FACILITY);
+			dosyslog = 1;
+			continue;
 
 			/* now the general management options.  Some are applicable
 			 * to other modes. None have arguments.
@@ -557,6 +668,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';
@@ -603,6 +719,7 @@ 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'):
 			if (devmode && devmode != opt &&
@@ -617,23 +734,121 @@ 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(GROW,'b'):
+		case O(BUILD,'b'):
+		case O(CREATE,'b'): /* here we create the bitmap */
+			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(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;
 		}
 		/* 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;
+			}
+		fputs(help_text,stderr);
+		exit(0);
+	}
+
+	if (!mode && devs_found) {
+		mode = MISC;
+		devmode = 'Q';
+		if (devlist->disposition == 0)
+			devlist->disposition = devmode;
+	}
 	if (!mode) {
 		fputs(Usage, stderr);
 		exit(2);
@@ -658,13 +873,45 @@ int main(int argc, char *argv[])
 			fprintf(stderr, Name ": --super-minor=dev is incompatible with --auto\n");	
 			exit(2);
 		}
+		if (mode == MANAGE && runstop < 0)
+			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(configfile);
+	if (homehost && strcmp(homehost, "<system>")==0) {
+		if (gethostname(sys_hostname, sizeof(sys_hostname)) == 0) {
+			sys_hostname[sizeof(sys_hostname)-1] = 0;
+			homehost = sys_hostname;
 		}
 	}
 
@@ -676,15 +923,15 @@ 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, 0);
 		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);
 			if (array_ident == NULL) {
@@ -692,25 +939,30 @@ int main(int argc, char *argv[])
 					devlist->devname);
 				rv |= 1;
 			} else {
-				mdfd = open_mddev(devlist->devname, array_ident->autof);
+				mdfd = open_mddev(devlist->devname, 
+						  array_ident->autof ? array_ident->autof : autof);
 				if (mdfd < 0)
 					rv |= 1;
 				else {
-					rv |= Assemble(devlist->devname, mdfd, array_ident, configfile,
-						       NULL,
-						       readonly, runstop, update, verbose, force);
+					rv |= Assemble(ss, devlist->devname, mdfd, array_ident, configfile,
+						       NULL, backup_file,
+						       readonly, runstop, update, homehost, verbose-quiet, force);
 					close(mdfd);
 				}
 			}
 		} else if (!scan)
-			rv = Assemble(devlist->devname, mdfd, &ident, configfile,
-				      devlist->next,
-				      readonly, runstop, update, verbose, force);
+			rv = Assemble(ss, devlist->devname, mdfd, &ident, configfile,
+				      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);
 				if (array_ident == NULL) {
@@ -719,46 +971,117 @@ int main(int argc, char *argv[])
 					rv |= 1;
 					continue;
 				}
-				mdfd = open_mddev(dv->devname, array_ident->autof);
+				mdfd = open_mddev(dv->devname, 
+						  array_ident->autof ?array_ident->autof : autof);
 				if (mdfd < 0) {
 					rv |= 1;
 					continue;
 				}
-				rv |= Assemble(dv->devname, mdfd, array_ident, configfile,
-					       NULL,
-					       readonly, runstop, update, verbose, force);
+				rv |= Assemble(ss, dv->devname, mdfd, array_ident, configfile,
+					       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) {
-				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,
+			mddev_dev_t devlist = conf_get_devs(configfile);
+			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 */
+					;
+				else {
+					rv |= Assemble(ss, array_list->devname, mdfd,
 						       array_list, configfile,
-						       NULL,
-						       readonly, runstop, NULL, verbose, force);
+						       devlist, 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 {
+					acnt = 0;
+					do {
+						rv2 = Assemble(ss, NULL, -1,
+							       &ident, configfile,
+							       devlist, NULL,
+							       readonly, runstop, NULL, homehost, verbose-quiet, force);
+						if (rv2==0) {
+							cnt++;
+							acnt++;
+						}
+					} while (rv2!=2);
+					/* Incase there are stacked devices, we need to go around again */
+					devlist = conf_get_devs(configfile);
+				} 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:
-		rv = Build(devlist->devname, mdfd, chunk, level, layout, 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 (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;
+		}
+
+		rv = Create(ss, devlist->devname, mdfd, chunk, level, layout, size<0 ? 0 : size,
+			    raiddisks, sparedisks, ident.name, homehost,
+			    devs_found-1, devlist->next, runstop, verbose-quiet, force, assume_clean,
+			    bitmap_file, bitmap_chunk, write_behind, delay);
 		break;
 	case MISC:
 
@@ -773,12 +1096,12 @@ int main(int argc, char *argv[])
 				fprintf(stderr, Name ": No devices listed in %s\n", configfile?configfile:DefaultConfFile);
 				exit(1);
 			}
-			rv = Examine(devlist, scan?!verbose:brief, scan, SparcAdjust);
+			rv = Examine(devlist, scan?(verbose>1?0:verbose+1):brief, 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);
@@ -788,16 +1111,44 @@ 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, 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, !last))
+									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);
 				}
@@ -805,24 +1156,29 @@ 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, test, homehost); continue;
 				case 'K': /* Zero superblock */
-					rv |= Kill(dv->devname, force); continue;
+					rv |= Kill(dv->devname, force, quiet); continue;
 				case 'Q':
 					rv |= Query(dv->devname); continue;
+				case 'X':
+					rv |= ExamineBitmap(dv->devname, brief, ss); 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, 0); break;
 					case 'S':
-						rv |= Manage_runstop(dv->devname, mdfd, -1); break;
+						rv |= Manage_runstop(dv->devname, mdfd, -1, 0); 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;
@@ -838,7 +1194,8 @@ int main(int argc, char *argv[])
 			break;
 		}
 		rv= Monitor(devlist, mailaddr, program,
-			    delay?delay:60, daemonise, scan, oneshot, configfile, test, pidfile);
+			    delay?delay:60, daemonise, scan, oneshot,
+			    dosyslog, configfile, test, pidfile);
 		break;
 
 	case GROW:
@@ -855,15 +1212,20 @@ int main(int argc, char *argv[])
 				if (rv)
 					break;
 			}
-		} else if ((size >= 0) + (raiddisks != 0) +  (layout != UnSet) > 1) {
-			fprintf(stderr, Name ": can change at most one of size, raiddisks, and layout\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 = Manage_resize(devlist->devname, mdfd, size, raiddisks);
-		else 
+			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;
 	}