X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=mdadm.c;h=846bc9641af062d7436721e72794cb66c3903521;hp=187ad891031de6b80f3933c1528d312c1d0c7ecc;hb=refs%2Fheads%2Fmdadm-3.2.x;hpb=f80c8614b0014fde1220591fcc4a1365c9cde0c4

diff --git a/mdadm.c b/mdadm.c
index 187ad891..846bc964 100644
--- a/mdadm.c
+++ b/mdadm.c
@@ -73,7 +73,9 @@ int main(int argc, char *argv[])
 	int test = 0;
 	int export = 0;
 	int assume_clean = 0;
+	char *prefer = NULL;
 	char *symlinks = NULL;
+	int grow_continue = 0;
 	/* autof indicates whether and how to create device node.
 	 * bottom 3 bits are style.  Rest (when shifted) are number of parts
 	 * 0  - unset
@@ -103,15 +105,17 @@ int main(int argc, char *argv[])
 	char *shortopt = short_options;
 	int dosyslog = 0;
 	int rebuild_map = 0;
-	int auto_update_home = 0;
 	char *subarray = NULL;
 	char *remove_path = NULL;
+	char *udev_filename = NULL;
 
 	int print_help = 0;
 	FILE *outf;
 
 	int mdfd = -1;
 
+	int freeze_reshape = 0;
+
 	srandom(time(0) ^ getpid());
 
 	ident.uuid_set=0;
@@ -171,6 +175,23 @@ int main(int argc, char *argv[])
 				homehost = optarg;
 			continue;
 
+		/*
+		 * --offroot sets first char of argv[0] to @. This is used
+		 * by systemd to signal that the tast was launched from
+		 * initrd/initramfs and should be preserved during shutdown
+		 */
+		case OffRootOpt:
+			argv[0][0] = '@';
+			__offroot = 1;
+			continue;
+
+		case Prefer:
+			if (prefer)
+				free(prefer);
+			if (asprintf(&prefer, "/%s/", optarg) <= 0)
+				prefer = NULL;
+			continue;
+
 		case ':':
 		case '?':
 			fputs(Usage, stderr);
@@ -209,13 +230,17 @@ int main(int argc, char *argv[])
 		case 'I': newmode = INCREMENTAL;
 			shortopt = short_bitmap_auto_options; break;
 		case AutoDetect:
-			newmode = AUTODETECT; break;
+			newmode = AUTODETECT;
+			break;
 
 		case MiscOpt:
 		case 'D':
 		case 'E':
 		case 'X':
-		case 'Q': newmode = MISC; break;
+		case 'Q':
+			newmode = MISC;
+			break;
+
 		case 'R':
 		case 'S':
 		case 'o':
@@ -226,16 +251,15 @@ int main(int argc, char *argv[])
 		case DetailPlatform:
 		case KillSubarray:
 		case UpdateSubarray:
-			if (opt == KillSubarray || opt == UpdateSubarray) {
-				if (subarray) {
-					fprintf(stderr, Name ": subarray can only"
-						" be specified once\n");
-					exit(2);
-				}
-				subarray = optarg;
-			}
-		case 'K': if (!mode) newmode = MISC; break;
-		case NoSharing: newmode = MONITOR; break;
+		case UdevRules:
+		case 'K':
+			if (!mode)
+				newmode = MISC;
+			break;
+
+		case NoSharing:
+			newmode = MONITOR;
+			break;
 		}
 		if (mode && newmode == mode) {
 			/* everybody happy ! */
@@ -252,6 +276,12 @@ int main(int argc, char *argv[])
 			exit(2);
 		} else if (!mode && newmode) {
 			mode = newmode;
+			if (mode == MISC && devs_found) {
+				fprintf(stderr, Name ": No action given for %s in --misc mode\n",
+					devlist->devname);
+				fprintf(stderr,"       Action options must come before device names\n");
+				exit(2);
+			}
 		} else {
 			/* special case of -c --help */
 			if ((opt == 'c' || opt == ConfigFile) &&
@@ -354,20 +384,15 @@ int main(int argc, char *argv[])
 				exit(2);
 			}
 			chunk = parse_size(optarg);
-			if (chunk < 8 || ((chunk-1)&chunk)) {
+			if (chunk < 8 || (chunk&1)) {
 				fprintf(stderr, Name ": invalid chunk/rounding value: %s\n",
 					optarg);
 				exit(2);
 			}
-			/* Covert sectors to K */
+			/* Convert sectors to K */
 			chunk /= 2;
 			continue;
 
-#if 0
-		case O(ASSEMBLE,AutoHomeHost):
-			auto_update_home = 1;
-			continue;
-#endif
 		case O(INCREMENTAL, 'e'):
 		case O(CREATE,'e'):
 		case O(ASSEMBLE,'e'):
@@ -540,6 +565,7 @@ int main(int argc, char *argv[])
 
 		case O(CREATE,AssumeClean):
 		case O(BUILD,AssumeClean): /* assume clean */
+		case O(GROW,AssumeClean):
 			assume_clean = 1;
 			continue;
 
@@ -606,10 +632,15 @@ int main(int argc, char *argv[])
 		case O(ASSEMBLE,Force): /* force assembly */
 		case O(MISC,'f'): /* force zero */
 		case O(MISC,Force): /* force zero */
+		case O(MANAGE,Force): /* add device which is too large */
 			force=1;
 			continue;
-
 			/* now for the Assemble options */
+		case O(ASSEMBLE, FreezeReshape):   /* Freeze reshape during
+						    * initrd phase */
+		case O(INCREMENTAL, FreezeReshape):
+			freeze_reshape = 1;
+			continue;
 		case O(CREATE,'u'): /* uuid of array */
 		case O(ASSEMBLE,'u'): /* uuid of array */
 			if (ident.uuid_set) {
@@ -666,12 +697,14 @@ int main(int argc, char *argv[])
 		case O(ASSEMBLE,'U'): /* update the superblock */
 		case O(MISC,'U'):
 			if (update) {
-				fprintf(stderr, Name ": Can only update one aspect of superblock, both %s and %s given.\n",
+				fprintf(stderr, Name ": Can only update one aspect"
+					" of superblock, both %s and %s given.\n",
 					update, optarg);
 				exit(2);
 			}
 			if (mode == MISC && !subarray) {
-				fprintf(stderr, Name ": Only subarrays can be updated in misc mode\n");
+				fprintf(stderr, Name ": Only subarrays can be"
+					" updated in misc mode\n");
 				exit(2);
 			}
 			update = optarg;
@@ -695,13 +728,17 @@ int main(int argc, char *argv[])
 				continue;
 			if (strcmp(update, "byteorder")==0) {
 				if (ss) {
-					fprintf(stderr, Name ": must not set metadata type with --update=byteorder.\n");
+					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");
+					ss = superlist[i]->match_metadata_desc(
+						"0.swap");
 				if (!ss) {
-					fprintf(stderr, Name ": INTERNAL ERROR cannot find 0.swap\n");
+					fprintf(stderr, Name ": INTERNAL ERROR"
+						" cannot find 0.swap\n");
 					exit(2);
 				}
 
@@ -723,6 +760,27 @@ int main(int argc, char *argv[])
 		"     'no-bitmap'\n");
 			exit(outf == stdout ? 0 : 2);
 
+		case O(MANAGE,'U'):
+			/* update=devicesize is allowed with --re-add */
+			if (devmode != 'a' || re_add != 1) {
+				fprintf(stderr, Name "--update in Manage mode only"
+					" allowed with --re-add.\n");
+				exit(1);
+			}
+			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, "devicesize") != 0) {
+				fprintf(stderr, Name ": only 'devicesize' can be"
+					" updated with --re-add\n");
+				exit(2);
+			}
+			continue;
+
 		case O(INCREMENTAL,NoDegraded):
 			fprintf(stderr, Name ": --no-degraded is deprecated in Incremental mode\n");
 		case O(ASSEMBLE,NoDegraded): /* --no-degraded */
@@ -810,6 +868,7 @@ int main(int argc, char *argv[])
 			continue;
 		case O(MONITOR,'1'): /* oneshot */
 			oneshot = 1;
+			spare_sharing = 0;
 			continue;
 		case O(MONITOR,'t'): /* test */
 			test = 1;
@@ -885,6 +944,14 @@ int main(int argc, char *argv[])
 		case O(MISC, DetailPlatform):
 		case O(MISC, KillSubarray):
 		case O(MISC, UpdateSubarray):
+			if (opt == KillSubarray || opt == UpdateSubarray) {
+				if (subarray) {
+					fprintf(stderr, Name ": subarray can only"
+						" be specified once\n");
+					exit(2);
+				}
+				subarray = optarg;
+			}
 			if (devmode && devmode != opt &&
 			    (devmode == 'E' || (opt == 'E' && devmode != 'Q'))) {
 				fprintf(stderr, Name ": --examine/-E cannot be given with ");
@@ -902,6 +969,20 @@ int main(int argc, char *argv[])
 			}
 			devmode = opt;
 			continue;
+               case O(MISC, UdevRules):
+		       if (devmode && devmode != opt) {
+                               fprintf(stderr, Name ": --udev-rules must"
+				       " be the only option.\n");
+		       } else {
+			       if (udev_filename)
+				       fprintf(stderr, Name ": only specify one udev "
+					       "rule filename. %s ignored.\n",
+					       optarg);
+			       else
+				       udev_filename = optarg;
+		       }
+		       devmode = opt;
+		       continue;
 		case O(MISC,'t'):
 			test = 1;
 			continue;
@@ -944,6 +1025,11 @@ int main(int argc, char *argv[])
 			backup_file = optarg;
 			continue;
 
+		case O(GROW, Continue):
+			/* Continue interrupted grow
+			 */
+			grow_continue = 1;
+			continue;
 		case O(ASSEMBLE, InvalidBackup):
 			/* Acknowledge that the backupfile is invalid, but ask
 			 * to continue anyway
@@ -978,15 +1064,14 @@ int main(int argc, char *argv[])
 		case O(BUILD,BitmapChunk):
 		case O(CREATE,BitmapChunk): /* bitmap chunksize */
 			bitmap_chunk = parse_size(optarg);
-			if (bitmap_chunk < 0 ||
+			if (bitmap_chunk <= 0 ||
 			    bitmap_chunk & (bitmap_chunk - 1)) {
 				fprintf(stderr,
 					Name ": invalid bitmap chunksize: %s\n",
 					optarg);
 				exit(2);
 			}
-			/* convert sectors to B, chunk of 0 means 512B */
-			bitmap_chunk = bitmap_chunk ? bitmap_chunk * 512 : 512;
+			bitmap_chunk = bitmap_chunk * 512;
 			continue;
 
 		case O(GROW, WriteBehind):
@@ -1130,14 +1215,19 @@ int main(int argc, char *argv[])
 
 	if (homehost == NULL)
 		homehost = conf_get_homehost(&require_homehost);
-	if (homehost == NULL || strcmp(homehost, "<system>")==0) {
+	if (homehost == NULL || strcasecmp(homehost, "<system>")==0) {
 		if (gethostname(sys_hostname, sizeof(sys_hostname)) == 0) {
 			sys_hostname[sizeof(sys_hostname)-1] = 0;
 			homehost = sys_hostname;
 		}
 	}
+	if (homehost && (!homehost[0] || strcasecmp(homehost, "<none>") == 0)) {
+		homehost = NULL;
+		require_homehost = 0;
+	}
 
-	if ((mode != MISC || devmode != 'E') &&
+	if (!((mode == MISC && devmode == 'E')
+	      || (mode == MONITOR && spare_sharing == 0)) &&
 	    geteuid() != 0) {
 		fprintf(stderr, Name ": must be super-user to perform this action\n");
 		exit(1);
@@ -1153,7 +1243,8 @@ 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, verbose-quiet, test);
+					    devlist->next, verbose-quiet, test,
+					    update, force);
 		if (!rv && readonly < 0)
 			rv = Manage_ro(devlist->devname, mdfd, readonly);
 		if (!rv && runstop)
@@ -1177,14 +1268,16 @@ int main(int argc, char *argv[])
 					       NULL, backup_file, invalid_backup,
 					       readonly, runstop, update,
 					       homehost, require_homehost,
-					       verbose-quiet, force);
+					       verbose-quiet, force,
+					       freeze_reshape);
 			}
 		} else if (!scan)
 			rv = Assemble(ss, devlist->devname, &ident,
 				      devlist->next, backup_file, invalid_backup,
 				      readonly, runstop, update,
 				      homehost, require_homehost,
-				      verbose-quiet, force);
+				      verbose-quiet, force,
+				      freeze_reshape);
 		else if (devs_found>0) {
 			if (update && devs_found > 1) {
 				fprintf(stderr, Name ": can only update a single array at a time\n");
@@ -1208,13 +1301,22 @@ int main(int argc, char *argv[])
 					       NULL, backup_file, invalid_backup,
 					       readonly, runstop, update,
 					       homehost, require_homehost,
-					       verbose-quiet, force);
+					       verbose-quiet, force,
+					       freeze_reshape);
 			}
 		} else {
 			struct mddev_ident *a, *array_list =  conf_get_ident(NULL);
 			struct mddev_dev *devlist = conf_get_devs();
+			struct map_ent *map = NULL;
 			int cnt = 0;
 			int failures, successes;
+
+			if (conf_verify_devnames(array_list)) {
+				fprintf(stderr, Name
+					": Duplicate MD device names in "
+					"conf file were found.\n");
+				exit(1);
+			}
 			if (devlist == NULL) {
 				fprintf(stderr, Name ": No devices listed in conf file were found.\n");
 				exit(1);
@@ -1232,6 +1334,10 @@ int main(int argc, char *argv[])
 				if (a->autof == 0)
 					a->autof = autof;
 			}
+			if (map_lock(&map))
+				fprintf(stderr, Name " %s: failed to get "
+					"exclusive lock on mapfile\n",
+					__func__);
 			do {
 				failures = 0;
 				successes = 0;
@@ -1249,7 +1355,8 @@ int main(int argc, char *argv[])
 						     NULL, NULL, 0,
 						     readonly, runstop, NULL,
 						     homehost, require_homehost,
-						     verbose-quiet, force);
+						     verbose-quiet, force,
+						     freeze_reshape);
 					if (r == 0) {
 						a->assembled = 1;
 						successes++;
@@ -1274,45 +1381,20 @@ int main(int argc, char *argv[])
 						rv2 = Assemble(ss, NULL,
 							       &ident,
 							       devlist, NULL, 0,
-							       readonly, runstop, NULL,
-							       homehost, require_homehost,
-							       verbose-quiet, force);
+							       readonly,
+							       runstop, NULL,
+							       homehost,
+							       require_homehost,
+							       verbose-quiet,
+							       force,
+							       freeze_reshape);
 						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 0
-				if (cnt == 0 && auto_update_home && homehost) {
-					/* Nothing found, maybe we need to bootstrap homehost info */
-					do {
-						acnt = 0;
-						do {
-							rv2 = Assemble(
-								ss, NULL,
-								&ident,
-								NULL, NULL, 0,
-								readonly, runstop,
-								"homehost",
-								homehost,
-								require_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);
-				}
-#endif
 				if (cnt == 0 && rv == 0) {
 					fprintf(stderr, Name ": No arrays found in config file or automatically\n");
 					rv = 1;
@@ -1322,6 +1404,7 @@ int main(int argc, char *argv[])
 				fprintf(stderr, Name ": No arrays found in config file\n");
 				rv = 1;
 			}
+			map_unlock(&map);
 		}
 		break;
 	case BUILD:
@@ -1423,7 +1506,7 @@ int main(int argc, char *argv[])
 						if (devmode == 'D')
 							rv |= Detail(name, v,
 								     export, test,
-								     homehost);
+								     homehost, prefer);
 						else
 							rv |= WaitClean(name, -1, v);
 						put_md_name(name);
@@ -1465,6 +1548,8 @@ int main(int argc, char *argv[])
 						free_mdstat(ms);
 					} while (!last && err);
 					if (err) rv |= 1;
+				} else if (devmode == UdevRules) {
+					rv = Write_rules(udev_filename);
 				} else {
 					fprintf(stderr, Name ": No devices given.\n");
 					exit(2);
@@ -1475,7 +1560,7 @@ int main(int argc, char *argv[])
 				case 'D':
 					rv |= Detail(dv->devname,
 						     brief?1+verbose:0,
-						     export, test, homehost);
+						     export, test, homehost, prefer);
 					continue;
 				case 'K': /* Zero superblock */
 					if (ss)
@@ -1549,7 +1634,8 @@ int main(int argc, char *argv[])
 		}
 		rv= Monitor(devlist, mailaddr, program,
 			    delay?delay:60, daemonise, scan, oneshot,
-			    dosyslog, test, pidfile, increments, spare_sharing);
+			    dosyslog, test, pidfile, increments,
+			    spare_sharing, prefer);
 		break;
 
 	case GROW:
@@ -1584,22 +1670,26 @@ int main(int argc, char *argv[])
 				break;
 			}
 		}
-		if (devs_found > 1) {
-
+		if (devs_found > 1 && raiddisks == 0) {
 			/* must be '-a'. */
-			if (size >= 0 || raiddisks || chunk || layout_str != NULL || bitmap_file) {
-				fprintf(stderr, Name ": --add cannot be used with other geometry changes in --grow mode\n");
+			if (size >= 0 || chunk || layout_str != NULL || bitmap_file) {
+				fprintf(stderr, Name ": --add cannot be used with "
+					"other geometry changes in --grow mode\n");
 				rv = 1;
 				break;
 			}
 			for (dv=devlist->next; dv ; dv=dv->next) {
-				rv = Grow_Add_device(devlist->devname, mdfd, dv->devname);
+				rv = Grow_Add_device(devlist->devname, mdfd,
+						     dv->devname);
 				if (rv)
 					break;
 			}
 		} else if (bitmap_file) {
-			if (size >= 0 || raiddisks || chunk || layout_str != NULL) {
-				fprintf(stderr, Name ": --bitmap changes cannot be used with other geometry changes in --grow mode\n");
+			if (size >= 0 || raiddisks || chunk ||
+			    layout_str != NULL || devs_found > 1) {
+				fprintf(stderr, Name ": --bitmap changes cannot be "
+					"used with other geometry changes "
+					"in --grow mode\n");
 				rv = 1;
 				break;
 			}
@@ -1607,10 +1697,16 @@ int main(int argc, char *argv[])
 				delay = DEFAULT_BITMAP_DELAY;
 			rv = Grow_addbitmap(devlist->devname, mdfd, bitmap_file,
 					    bitmap_chunk, delay, write_behind, force);
-		} else if (size >= 0 || raiddisks != 0 || layout_str != NULL
+		} else if (grow_continue)
+			rv = Grow_continue_command(devlist->devname,
+						   mdfd, backup_file,
+						   verbose);
+		else if (size >= 0 || raiddisks != 0 || layout_str != NULL
 			   || chunk != 0 || level != UnSet) {
 			rv = Grow_reshape(devlist->devname, mdfd, quiet, backup_file,
-					  size, level, layout_str, chunk, raiddisks);
+					  size, level, layout_str, chunk, raiddisks,
+					  devlist->next,
+					  assume_clean, force);
 		} else if (array_size < 0)
 			fprintf(stderr, Name ": no changes to --grow\n");
 		break;
@@ -1651,7 +1747,8 @@ int main(int argc, char *argv[])
 		else
 			rv = Incremental(devlist->devname, verbose-quiet,
 					 runstop, ss, homehost,
-					 require_homehost, autof);
+					 require_homehost, autof,
+					 freeze_reshape);
 		break;
 	case AUTODETECT:
 		autodetect();