X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=Create.c;h=692a74ccde8e452533e0d069e88359d651c5267d;hp=f4567ca391c9f2bed779f1bc2d45c9bc82930b6a;hb=7364918895b6b014d1a675c38973845cdf3baf41;hpb=edd8d13c0247b8df5876a94c2d61d74d2cf62c7e

diff --git a/Create.c b/Create.c
index f4567ca3..692a74cc 100644
--- a/Create.c
+++ b/Create.c
@@ -245,7 +245,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 	}
 
 	if (st && ! st->ss->validate_geometry(st, level, layout, raiddisks,
-					      chunk, size, NULL, NULL))
+					      chunk, size, NULL, NULL, verbose>=0))
 		return 1;
 
 	/* now look at the subdevs */
@@ -281,7 +281,8 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 				st = superlist[i]->match_metadata_desc(name);
 				if (st && !st->ss->validate_geometry
 					    	(st, level, layout, raiddisks,
-						 chunk, size, dname, &freesize))
+						 chunk, size, dname, &freesize,
+						 verbose > 0))
 					st = NULL;
 			}
 
@@ -298,7 +299,8 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 			if (!st->ss->validate_geometry(st, level, layout,
 						       raiddisks,
 						       chunk, size, dname,
-						       &freesize)) {
+						       &freesize,
+						       verbose > 0)) {
 
 				fprintf(stderr,
 					Name ": %s is not suitable for "
@@ -360,7 +362,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 			if (!st->ss->validate_geometry(st, level, layout,
 						       raiddisks,
 						       chunk, minsize,
-						       NULL, NULL)) {
+						       NULL, NULL, 0)) {
 				fprintf(stderr, Name ": devices too large for RAID level %d\n", level);
 				return 1;
 			}
@@ -446,11 +448,13 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 	     ( level <= 0 )
 	     ||
 	     assume_clean
-		)
+		) {
 		info.array.state = 1; /* clean, but one+ drive will be missing*/
-	else
+		info.resync_start = ~0ULL;
+	} else {
 		info.array.state = 0; /* not clean, but no errors */
-
+		info.resync_start = 0;
+	}
 	if (level == 10) {
 		/* for raid10, the bitmap size is the capacity of the array,
 		 * which is array.size * raid_disks / ncopies;
@@ -518,9 +522,27 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 	total_slots = info.array.nr_disks;
 	st->ss->getinfo_super(st, &info);
 
-	if (did_default)
-		fprintf(stderr, Name ": Defaulting to version"
-			" %s metadata\n", info.text_version);
+	if (did_default && verbose >= 0) {
+		if (info.text_version[0] == '/') {
+			int dnum = devname2devnum(info.text_version+1);
+			char *path;
+			int mdp = get_mdp_major();
+			struct mdinfo *mdi;
+			if (dnum > 0)
+				path = map_dev(MD_MAJOR, dnum, 1);
+			else
+				path = map_dev(mdp, (-1-dnum)<< 6, 1);
+
+			mdi = sysfs_read(-1, dnum, GET_VERSION);
+
+			fprintf(stderr, Name ": Creating array inside "
+				"%s container %s\n", 
+				mdi?mdi->text_version:"managed", path);
+			sysfs_free(mdi);
+		} else
+			fprintf(stderr, Name ": Defaulting to version"
+				" %s metadata\n", info.text_version);
+	}
 
 	if (bitmap_file && vers < 9003) {
 		major_num = BITMAP_MAJOR_HOSTENDIAN;
@@ -747,28 +769,10 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 		if (verbose >= 0)
 			fprintf(stderr, Name ": array %s started.\n", mddev);
 		if (st->ss->external && st->subarray[0]) {
-			if (need_mdmon) {
-				int dn = st->container_dev;
-				int i;
-				switch(fork()) {
-				case 0:
-					/* FIXME yuk. CLOSE_EXEC?? */
-					for (i=3; i < 100; i++)
-						close(i);
-					execl("./mdmon", "mdmon",
-					      map_dev(dev2major(dn),
-						      dev2minor(dn),
-						      1), NULL);
-					exit(1);
-				case -1: fprintf(stderr, Name ": cannot fork. "
-						 "Array remains readonly\n");
-					return 1;
-				default: ; /* parent - good */
-				}
-			} else
-				signal_mdmon(st->container_dev);
-			/* FIXME wait for mdmon to set array to read-auto */
-			sleep(1);
+			if (need_mdmon)
+				start_mdmon(st->container_dev);
+
+			ping_monitor(devnum2devname(st->container_dev));
 			close(container_fd);
 		}
 	} else {