X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=mdadm.c;h=a6f116f78f599c2963497728eed9c8cb12c22e2d;hb=48f7b27ab48fc3ea0fa7d965604adbb275eb1c95;hp=e1a869ebad540bfe3584d4c2fb298e978ebb3343;hpb=56eb10c0b6e8f21540af444c8a28aa9e8f138ce6;p=thirdparty%2Fmdadm.git

diff --git a/mdadm.c b/mdadm.c
index e1a869eb..a6f116f7 100644
--- a/mdadm.c
+++ b/mdadm.c
@@ -29,46 +29,34 @@
 
 #include "mdadm.h"
 #include "md_p.h"
-
-int open_mddev(char *dev)
-{
-	int 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;
-}
+#include <ctype.h>
 
 
 
 int main(int argc, char *argv[])
 {
-	char mode = '\0';
+	int mode = 0;
 	int opt;
+	int option_index;
 	char *help_text;
 	char *c;
 	int rv;
-	int i;
 
 	int chunk = 0;
-	int size = 0;
-	int level = -10;
-	int layout = -1;
+	int size = -1;
+	int level = UnSet;
+	int layout = UnSet;
 	int raiddisks = 0;
 	int sparedisks = 0;
 	struct mddev_ident_s ident;
 	char *configfile = NULL;
 	char *cp;
+	char *update = NULL;
 	int scan = 0;
 	char devmode = 0;
 	int runstop = 0;
 	int readonly = 0;
+	int SparcAdjust = 0;
 	mddev_dev_t devlist = NULL;
 	mddev_dev_t *devlistend = & devlist;
 	mddev_dev_t dv;
@@ -76,50 +64,58 @@ int main(int argc, char *argv[])
 	int verbose = 0;
 	int brief = 0;
 	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 *mailaddr = NULL;
 	char *program = NULL;
 	int delay = 0;
+	int daemonise = 0;
+	char *pidfile = NULL;
+	int oneshot = 0;
+
+	int copies;
 
 	int mdfd = -1;
 
 	ident.uuid_set=0;
-	ident.level = -10;
-	ident.raid_disks = -1;
-	ident.super_minor= -1;
+	ident.level = UnSet;
+	ident.raid_disks = UnSet;
+	ident.super_minor= UnSet;
 	ident.devices=0;
+	ident.spare_group = NULL;
+	ident.autof = 0;
 
-	while ((opt=getopt_long(argc, argv,
+	while ((option_index = -1) ,
+	       (opt=getopt_long(argc, argv,
 				short_options, long_options,
-				NULL)) != -1) {
-
+				&option_index)) != -1) {
+		int newmode = mode;
+		/* firstly, so mode-independant options */
 		switch(opt) {
-		case '@': /* just incase they say --manage */
-		case 'A':
-		case 'B':
-		case 'C':
-		case 'D':
-		case 'E':
-		case 'F':
-		case 'H':
-			/* setting mode - only once */
-			if (mode) {
-				fprintf(stderr, Name ": --%s/-%c not allowed, mode already set to %s\n",
-					long_options[opt-'A'+1].name,
-					long_options[opt-'A'+1].val,
-					long_options[mode-'A'+1].name);
-				exit(2);
-			}
-			mode = opt;
-			continue;
-
 		case 'h':
 			help_text = Help;
-			switch (mode) {
-			case 'C': help_text = Help_create; break;
-			case 'B': help_text = Help_build; break;
-			case 'A': help_text = Help_assemble; break;
-			}
+			if (option_index > 0 && 
+			    strcmp(long_options[option_index].name, "help-options")==0)
+				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);
 
@@ -133,20 +129,91 @@ int main(int argc, char *argv[])
 		case 'b': brief = 1;
 			continue;
 
-		case 1: /* an undecorated option - must be a device name.
-			 * Depending on mode, it could be that:
-			 *    All devices listed are "md" devices : --Detail, -As
-			 *    No devices are "md" devices : --Examine
-			 *    First device is "md", others are component: -A,-B,-C
-			 * Only accept on device before mode is determined.
-			 *  If mode is @, then require devmode for other devices.
+		case ':':
+		case '?':
+			fputs(Usage, stderr);
+			exit(2);
+		}
+		/* second, figure out the mode.
+		 * Some options force the mode.  Others
+		 * set the mode if it isn't already 
+		 */
+
+		switch(opt) {
+		case '@': /* just incase they say --manage */
+			newmode = MANAGE; break;
+		case 'a':
+		case 'r':
+		case 'f':
+		case 1 : if (!mode) newmode = MANAGE; break;
+
+		case 'A': newmode = ASSEMBLE; break;
+		case 'B': newmode = BUILD; break;
+		case 'C': newmode = CREATE; break;
+		case 'F': newmode = MONITOR;break;
+		case 'G': newmode = GROW; break;
+
+		case '#':
+		case 'D':
+		case 'E':
+		case 'Q': newmode = MISC; break;
+		case 'R':
+		case 'S':
+		case 'o':
+		case 'w':
+		case 'K': if (!mode) newmode = MISC; break;
+		}
+		if (mode && newmode == mode) {
+			/* everybody happy ! */
+		} else if (mode && newmode != mode) {
+			/* not allowed.. */
+			fprintf(stderr, Name ": ");
+			if (option_index >= 0)
+				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",
+				map_num(modes, newmode),
+				map_num(modes, mode));
+			exit(2);
+		} else if (!mode && newmode) {
+			mode = newmode;
+		} else {
+			/* special case of -c --help */
+			if (opt == 'c' && 
+			    ( strncmp(optarg, "--h", 3)==0 ||
+			      strncmp(optarg, "-h", 2)==0)) {
+				fputs(Help_config, stderr);
+				exit(0);
+			}
+			if (option_index >= 0)
+				fprintf(stderr, "--%s", long_options[option_index].name);
+			else
+				fprintf(stderr, "-%c", opt);
+			fprintf(stderr, " does not set the mode, and so cannot be first.\n");
+			exit(2);
+		}
+
+		/* if we just set the mode, then done */
+		switch(opt) {
+		case '@':
+		case '#':
+		case 'A':
+		case 'B':
+		case 'C':
+		case 'F':
+		case 'G':
+			continue;
+		}
+		if (opt == 1) {
+		        /* an undecorated option - must be a device name.
 			 */
-			if (devs_found > 0 && !mode ) {
-				fprintf(stderr, Name ": Must give mode flag before second device name at %s\n", optarg);
+			if (devs_found > 0 && mode == '@' && !devmode) {
+				fprintf(stderr, Name ": Must give one of -a/-r/-f for subsequent devices at %s\n", optarg);
 				exit(2);
 			}
-			if (devs_found > 0 && mode == '@' && !devmode) {
-				fprintf(stderr, Name ": Must give on of -a/-r/-f for subsequent devices at %s\n", optarg);
+			if (devs_found > 0 && mode == 'G' && !devmode) {
+				fprintf(stderr, Name ": Must give one of -a for devices do add: %s\n", optarg);
 				exit(2);
 			}
 			dv = malloc(sizeof(*dv));
@@ -162,22 +229,14 @@ int main(int argc, char *argv[])
 			
 			devs_found++;
 			continue;
-
-		case ':':
-		case '?':
-			fputs(Usage, stderr);
-			exit(2);
-		default:
-			/* force mode setting - @==manage if nothing else */
-			if (!mode) mode = '@';
 		}
 
 		/* We've got a mode, and opt is now something else which
 		 * could depend on the mode */
 #define O(a,b) ((a<<8)|b)
 		switch (O(mode,opt)) {
-		case O('C','c'):
-		case O('B','c'): /* chunk or rounding */
+		case O(CREATE,'c'):
+		case O(BUILD,'c'): /* chunk or rounding */
 			if (chunk) {
 				fprintf(stderr, Name ": chunk/rounding may only be specified once. "
 					"Second value is %s.\n", optarg);
@@ -191,48 +250,56 @@ int main(int argc, char *argv[])
 			}
 			continue;
 
-		case O('C','z'): /* size */
-			if (size) {
+		case O(GROW,'z'):
+		case O(CREATE,'z'): /* size */
+			if (size >= 0) {
 				fprintf(stderr, Name ": size may only be specified once. "
 					"Second value is %s.\n", optarg);
 				exit(2);
 			}
-			size = strtol(optarg, &c, 10);
-			if (!optarg[0] || *c || size < 4) {
-				fprintf(stderr, Name ": invalid size: %s\n",
-					optarg);
-				exit(2);
+			if (strcmp(optarg, "max")==0)
+				size = 0;
+			else {
+				size = strtol(optarg, &c, 10);
+				if (!optarg[0] || *c || size < 4) {
+					fprintf(stderr, Name ": invalid size: %s\n",
+						optarg);
+					exit(2);
+				}
 			}
 			continue;
 
-		case O('C','l'):
-		case O('B','l'): /* set raid level*/
-			if (level != -10) {
+		case O(GROW,'l'): /* hack - needed to understand layout */
+		case O(CREATE,'l'):
+		case O(BUILD,'l'): /* set raid level*/
+			if (level != UnSet) {
 				fprintf(stderr, Name ": raid level may only be set once.  "
 					"Second value is %s.\n", optarg);
 				exit(2);
 			}
 			level = map_name(pers, optarg);
-			if (level == -10) {
+			if (level == UnSet) {
 				fprintf(stderr, Name ": invalid raid level: %s\n",
 					optarg);
 				exit(2);
 			}
-			if (level > 0 && mode == 'B') {
+			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);
 			}
-			if (sparedisks > 0 && level < 1) {
-				fprintf(stderr, Name ": raid level %s is incompatible with spare-disks setting.\n",
+			if (sparedisks > 0 && level < 1 && level >= -1) {
+				fprintf(stderr, Name ": raid level %s is incompatible with spare-devices setting.\n",
 					optarg);
 				exit(2);
 			}
 			ident.level = level;
 			continue;
 
-		case O('C','p'): /* raid5 layout */
-			if (layout >= 0) {
+		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);
 				exit(2);
@@ -242,63 +309,148 @@ int main(int argc, char *argv[])
 				fprintf(stderr, Name ": layout not meaningful for %s arrays.\n",
 					map_num(pers, level));
 				exit(2);
-			case -10:
+			case UnSet:
 				fprintf(stderr, Name ": raid level must be given before layout.\n");
 				exit(2);
 
 			case 5:
+			case 6:
 				layout = map_name(r5layout, optarg);
-				if (layout==-10) {
+				if (layout==UnSet) {
 					fprintf(stderr, Name ": layout %s not understood for raid5.\n",
 						optarg);
 					exit(2);
 				}
 				break;
+
+			case 10:
+				/* 'f' or 'n' followed by a number <= raid_disks */
+				if ((optarg[0] !=  'n' && optarg[0] != 'f') ||
+				    (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);
+					exit(2);
+				}
+				if (optarg[0] == 'n')
+					layout = 256 + copies;
+				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('C','n'):
-		case O('B','n'): /* number of raid disks */
+		case O(CREATE,3):
+		case O(BUILD,3): /* assume clean */
+			assume_clean = 1;
+			continue;
+
+		case O(GROW,'n'):
+		case O(CREATE,'n'):
+		case O(BUILD,'n'): /* number of raid disks */
 			if (raiddisks) {
-				fprintf(stderr, Name ": raid-disks set twice: %d and %s\n",
+				fprintf(stderr, Name ": raid-devices set twice: %d and %s\n",
 					raiddisks, optarg);
 				exit(2);
 			}
 			raiddisks = strtol(optarg, &c, 10);
 			if (!optarg[0] || *c || raiddisks<=0 || raiddisks > MD_SB_DISKS) {
-				fprintf(stderr, Name ": invalid number of raid disks: %s\n",
+				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;
 
-		case O('C','x'): /* number of spare (eXtra) discs */
+		case O(CREATE,'x'): /* number of spare (eXtra) discs */
 			if (sparedisks) {
-				fprintf(stderr,Name ": spare-disks set twice: %d and %s\n",
+				fprintf(stderr,Name ": spare-devices set twice: %d and %s\n",
 					sparedisks, optarg);
 				exit(2);
 			}
-			if (level > -10 && level < 1) {
-				fprintf(stderr, Name ": spare-disks setting is incompatible with raid level %d\n",
+			if (level != UnSet && level <= 0 && level >= -1) {
+				fprintf(stderr, Name ": spare-devices setting is incompatible with raid level %d\n",
 					level);
 				exit(2);
 			}
 			sparedisks = strtol(optarg, &c, 10);
 			if (!optarg[0] || *c || sparedisks < 0 || sparedisks > MD_SB_DISKS - raiddisks) {
-				fprintf(stderr, Name ": invalid number of spare disks: %s\n",
+				fprintf(stderr, Name ": invalid number of spare-devices: %s\n",
 					optarg);
 				exit(2);
 			}
 			continue;
-		case O('C','f'): /* force honouring of device list */
-		case O('A','f'): /* force assembly */
-		case O('H','f'): /* force zero */
+
+		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);
+				}
+			}
+			continue;
+
+		case O(BUILD,'f'): /* force honouring '-n 1' */
+		case O(CREATE,'f'): /* force honouring of device list */
+		case O(ASSEMBLE,'f'): /* force assembly */
+		case O(MISC,'f'): /* force zero */
 			force=1;
 			continue;
 
 			/* now for the Assemble options */
-		case O('A','u'): /* uuid of array */
+		case O(ASSEMBLE,'u'): /* uuid of array */
 			if (ident.uuid_set) {
 				fprintf(stderr, Name ": uuid cannot be set twice.  "
 					"Second value %s.\n", optarg);
@@ -312,21 +464,44 @@ int main(int argc, char *argv[])
 			}
 			continue;
 
-		case O('A','m'): /* super-minor for array */
-			if (ident.super_minor >= 0) {
+		case O(ASSEMBLE,'m'): /* super-minor for array */
+			if (ident.super_minor != UnSet) {
 				fprintf(stderr, Name ": super-minor cannot be set twice.  "
 					"Second value: %s.\n", optarg);
 				exit(2);
 			}
-			ident.super_minor = strtoul(optarg, &cp, 10);
-			if (!optarg[0] || *cp) {
-				fprintf(stderr, Name ": Bad super-minor number: %s.\n", optarg);
-				exit(2);
+			if (strcmp(optarg, "dev")==0)
+				ident.super_minor = -2;
+			else {
+				ident.super_minor = strtoul(optarg, &cp, 10);
+				if (!optarg[0] || *cp) {
+					fprintf(stderr, Name ": Bad super-minor number: %s.\n", optarg);
+					exit(2);
+				}
 			}
 			continue;
 
-		case O('A','c'): /* config file */
-		case O('F','c'):
+		case O(ASSEMBLE,'U'): /* update the superblock */
+			if (update) {
+				fprintf(stderr, Name ": Can only update one aspect of superblock, both %s and %s given.\n",
+					update, optarg);
+				exit(2);
+			}
+			update = optarg;
+			if (strcmp(update, "sparc2.2")==0) 
+				continue;
+			if (strcmp(update, "super-minor") == 0)
+				continue;
+			if (strcmp(update, "summaries")==0)
+				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);
+
+		case O(ASSEMBLE,'c'): /* config file */
+		case O(MISC, 'c'):
+		case O(MONITOR,'c'):
 			if (configfile) {
 				fprintf(stderr, Name ": configfile cannot be set twice.  "
 					"Second value is %s.\n", optarg);
@@ -335,12 +510,13 @@ int main(int argc, char *argv[])
 			configfile = optarg;
 			/* FIXME possibly check that config file exists.  Even parse it */
 			continue;
-		case O('A','s'): /* scan */
-		case O('E','s'):
+		case O(ASSEMBLE,'s'): /* scan */
+		case O(MISC,'s'):
+		case O(MONITOR,'s'):
 			scan = 1;
 			continue;
 
-		case O('F','m'): /* mail address */
+		case O(MONITOR,'m'): /* mail address */
 			if (mailaddr)
 				fprintf(stderr, Name ": only specify one mailaddress. %s ignored.\n",
 					optarg);
@@ -348,7 +524,7 @@ int main(int argc, char *argv[])
 				mailaddr = optarg;
 			continue;
 
-		case O('F','p'): /* alert program */
+		case O(MONITOR,'p'): /* alert program */
 			if (program)
 				fprintf(stderr, Name ": only specify one alter program. %s ignored.\n",
 					optarg);
@@ -356,7 +532,7 @@ int main(int argc, char *argv[])
 				program = optarg;
 			continue;
 
-		case O('F','d'): /* delay in seconds */
+		case O(MONITOR,'d'): /* delay in seconds */
 			if (delay)
 				fprintf(stderr, Name ": only specify delay once. %s ignored.\n",
 					optarg);
@@ -369,34 +545,47 @@ int main(int argc, char *argv[])
 				}
 			}
 			continue;
-			
+		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;
 
 			/* now the general management options.  Some are applicable
 			 * to other modes. None have arguments.
 			 */
-		case O('@','a'):
-		case O('C','a'):
-		case O('B','a'):
-		case O('A','a'): /* add a drive */
+		case O(GROW,'a'):
+		case O(MANAGE,'a'): /* add a drive */
 			devmode = 'a';
 			continue;
-		case O('@','r'): /* remove a drive */
+		case O(MANAGE,'r'): /* remove a drive */
 			devmode = 'r';
 			continue;
-		case O('@','f'): /* set faulty */
+		case O(MANAGE,'f'): /* set faulty */
 			devmode = 'f';
 			continue;
-		case O('@','R'):
-		case O('A','R'):
-		case O('B','R'):
-		case O('C','R'): /* Run the array */
+		case O(MANAGE,'R'):
+		case O(ASSEMBLE,'R'):
+		case O(BUILD,'R'):
+		case O(CREATE,'R'): /* Run the array */
 			if (runstop < 0) {
 				fprintf(stderr, Name ": Cannot both Stop and Run an array\n");
 				exit(2);
 			}
 			runstop = 1;
 			continue;
-		case O('@','S'):
+		case O(MANAGE,'S'):
 			if (runstop > 0) {
 				fprintf(stderr, Name ": Cannot both Run and Stop an array\n");
 				exit(2);
@@ -404,26 +593,54 @@ int main(int argc, char *argv[])
 			runstop = -1;
 			continue;
 
-		case O('@','o'):
+		case O(MANAGE,'o'):
 			if (readonly < 0) {
 				fprintf(stderr, Name ": Cannot have both readonly and readwrite\n");
 				exit(2);
 			}
 			readonly = 1;
 			continue;
-		case O('@','w'):
+		case O(MANAGE,'w'):
 			if (readonly > 0) {
-				fprintf(stderr, "mkdctl: Cannot have both readwrite and readonly.\n");
+				fprintf(stderr, Name ": Cannot have both readwrite and readonly.\n");
 				exit(2);
 			}
 			readonly = -1;
 			continue;
+
+		case O(MISC,'Q'):
+		case O(MISC,'D'):
+		case O(MISC,'E'):
+		case O(MISC,'K'):
+		case O(MISC,'R'):
+		case O(MISC,'S'):
+		case O(MISC,'o'):
+		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",
+					devmode =='E'?opt:devmode);
+				exit(2);
+			}
+			devmode = opt;
+			continue;
+		case O(MISC,'t'):
+			test = 1;
+			continue;
+
+		case O(MISC, 22):
+			if (devmode != 'E') {
+				fprintf(stderr, Name ": --sparc2.2 only allowed with --examine\n");
+				exit(2);
+			}
+			SparcAdjust = 1;
+			continue;
 		}
 		/* We have now processed all the valid options. Anything else is
 		 * an error
 		 */
-		fprintf(stderr, Name ": option %c not valid in mode %c\n",
-			opt, mode);
+		fprintf(stderr, Name ": option %c not valid in %s mode\n",
+			opt, map_num(modes, mode));
 		exit(2);
 
 	}
@@ -436,26 +653,35 @@ int main(int argc, char *argv[])
 	 * hopefully it's mostly right but there might be some stuff
 	 * missing
 	 *
-	 * That is mosty checked in ther per-mode stuff but...
+	 * That is mosty checked in the per-mode stuff but...
 	 *
 	 * For @,B,C  and A without -s, the first device listed must be an md device
 	 * we check that here and open it.
 	 */
 
-	if (mode=='@' || mode == 'B' || mode == 'C' || (mode == 'A' && ! scan)) {
+	if (mode==MANAGE || mode == BUILD || mode == CREATE || mode == GROW ||
+	    (mode == ASSEMBLE && ! scan)) {
 		if (devs_found < 1) {
 			fprintf(stderr, Name ": an md device must be given in this mode\n");
 			exit(2);
 		}
-		mdfd = open_mddev(devlist->devname);
+		if ((int)ident.super_minor == -2 && autof) {
+			fprintf(stderr, Name ": --super-minor=dev is incompatible with --auto\n");	
+			exit(2);
+		}
+		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);
+		}
 	}
 
-
 	rv = 0;
 	switch(mode) {
-	case '@':/* Management */
+	case MANAGE:
 		/* readonly, add/remove, readwrite, runstop */
 		if (readonly>0)
 			rv = Manage_ro(devlist->devname, mdfd, readonly);
@@ -467,30 +693,54 @@ int main(int argc, char *argv[])
 		if (!rv && runstop)
 			rv = Manage_runstop(devlist->devname, mdfd, runstop);
 		break;
-	case 'A': /* Assemble */
-		if (!scan)
+	case ASSEMBLE:
+		if (devs_found == 1 && ident.uuid_set == 0 &&
+		    ident.super_minor == UnSet && !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) {
+				fprintf(stderr, Name ": %s not identified in config file.\n",
+					devlist->devname);
+				rv |= 1;
+			} else {
+				mdfd = open_mddev(devlist->devname, array_ident->autof);
+				if (mdfd < 0)
+					rv |= 1;
+				else {
+					rv |= Assemble(devlist->devname, mdfd, array_ident, configfile,
+						       NULL,
+						       readonly, runstop, update, verbose, force);
+					close(mdfd);
+				}
+			}
+		} else if (!scan)
 			rv = Assemble(devlist->devname, mdfd, &ident, configfile,
 				      devlist->next,
-				      readonly, runstop, verbose, force);
-		else if (devs_found>0)
+				      readonly, runstop, update, verbose, 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);
+			}
 			for (dv = devlist ; dv ; dv=dv->next) {
 				mddev_ident_t array_ident = conf_get_ident(configfile, dv->devname);
-				mdfd = open_mddev(dv->devname);
-				if (mdfd < 0) {
-					rv |= 1;
-					continue;
-				}
 				if (array_ident == NULL) {
 					fprintf(stderr, Name ": %s not identified in config file.\n",
 						dv->devname);
 					rv |= 1;
 					continue;
 				}
+				mdfd = open_mddev(dv->devname, array_ident->autof);
+				if (mdfd < 0) {
+					rv |= 1;
+					continue;
+				}
 				rv |= Assemble(dv->devname, mdfd, array_ident, configfile,
 					       NULL,
-					       readonly, runstop, verbose, force);
+					       readonly, runstop, update, verbose, force);
+				close(mdfd);
 			}
-		else {
+		} else {
 			mddev_ident_t array_list =  conf_get_ident(configfile, NULL);
 			if (!array_list) {
 				fprintf(stderr, Name ": No arrays found in config file\n");
@@ -498,7 +748,7 @@ int main(int argc, char *argv[])
 			} else
 				for (; array_list; array_list = array_list->next) {
 					mdu_array_info_t array;
-					mdfd = open_mddev(array_list->devname);
+					mdfd = open_mddev(array_list->devname, array_list->autof);
 					if (mdfd < 0) {
 						rv |= 1;
 						continue;
@@ -509,36 +759,123 @@ int main(int argc, char *argv[])
 					rv |= Assemble(array_list->devname, mdfd,
 						       array_list, configfile,
 						       NULL,
-						       readonly, runstop, verbose, force);
+						       readonly, runstop, NULL, verbose, force);
 				}
 		}
 		break;
-	case 'B': /* Build */
-		rv = Build(devlist->devname, mdfd, chunk, level, raiddisks, devlist->next);
+	case BUILD:
+		rv = Build(devlist->devname, mdfd, chunk, level, layout, raiddisks, devlist->next, assume_clean);
 		break;
-	case 'C': /* Create */
-		rv = Create(devlist->devname, mdfd, chunk, level, layout, size,
+	case CREATE:
+		rv = Create(devlist->devname, mdfd, chunk, level, layout, size<0 ? 0 : size,
 			    raiddisks, sparedisks,
 			    devs_found-1, devlist->next, runstop, verbose, force);
 		break;
-	case 'D': /* Detail */
-		for (dv=devlist ; dv; dv=dv->next)
-			rv |= Detail(dv->devname, brief);
-		break;
-	case 'E': /* Examine */
-		if (devlist == NULL && scan==0) {
-			fprintf(stderr, Name ": No devices to examine\n");
-			exit(2);
+	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);
+			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);
+		} else {
+			if (devlist == NULL) {
+				if ((devmode == 'S' ||devmode=='D') && scan) {
+					/* apply to all devices in /proc/mdstat */
+					struct mdstat_ent *ms = mdstat_read(0);
+					struct mdstat_ent *e;
+					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;
+						}
+						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);
+						}
+						put_md_name(name);
+					}
+				} else {						
+					fprintf(stderr, Name ": No devices given.\n");
+					exit(2);
+				}
+			}
+			for (dv=devlist ; dv; dv=dv->next) {
+				switch(dv->disposition) {
+				case 'D':
+					rv |= Detail(dv->devname, brief, test); continue;
+				case 'K': /* Zero superblock */
+					rv |= Kill(dv->devname, force); continue;
+				case 'Q':
+					rv |= Query(dv->devname); continue;
+				}
+				mdfd = open_mddev(dv->devname, 0);
+				if (mdfd>=0)
+					switch(dv->disposition) {
+					case 'R':
+						rv |= Manage_runstop(dv->devname, mdfd, 1); break;
+					case 'S':
+						rv |= Manage_runstop(dv->devname, mdfd, -1); break;
+					case 'o':
+						rv |= Manage_ro(dv->devname, mdfd, 1); break;
+					case 'w':
+						rv |= Manage_ro(dv->devname, mdfd, -1); break;
+					}
+			}
 		}
-		rv = Examine(devlist, devlist?brief:!verbose, configfile);
 		break;
-	case 'F': /* Follow */
+	case MONITOR:
+		if (!devlist && !scan) {
+			fprintf(stderr, Name ": Cannot monitor: need --scan or at least one device\n");
+			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, configfile);
+			    delay?delay:60, daemonise, scan, oneshot, configfile, test, pidfile);
 		break;
-	case 'H': /* Zero superblock */
-		for (dv=devlist ; dv; dv=dv->next)
-			rv |= Kill(dv->devname, force);
+
+	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");
+				rv = 1;
+				break;
+			}
+			for (dv=devlist->next; dv ; dv=dv->next) {
+				rv = Grow_Add_device(devlist->devname, mdfd, dv->devname);
+				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");
+			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 
+			fprintf(stderr, Name ": no changes to --grow\n");
 		break;
 	}
 	exit(rv);