X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=mdassemble.c;h=f3b01202ebc24b272c8ba8c724da24401dc2551a;hp=28f431b45d3bb4b16733161ee7c8f793a2973444;hb=72d566f68d495261608a900b2d8cb8d037cd9178;hpb=1d54f2867b928bb1c3374f269599b8cbcb293193

diff --git a/mdassemble.c b/mdassemble.c
index 28f431b4..f3b01202 100644
--- a/mdassemble.c
+++ b/mdassemble.c
@@ -26,38 +26,16 @@
 #include "mdadm.h"
 #include "md_p.h"
 
-/* from readme.c */
-mapping_t pers[] = {
-	{ "linear", LEVEL_LINEAR},
-	{ "raid0", 0},
-	{ "0", 0},
-	{ "stripe", 0},
-	{ "raid1", 1},
-	{ "1", 1},
-	{ "mirror", 1},
-	{ "raid4", 4},
-	{ "4", 4},
-	{ "raid5", 5},
-	{ "5", 5},
-	{ "multipath", LEVEL_MULTIPATH},
-	{ "mp", LEVEL_MULTIPATH},
-	{ "raid6", 6},
-	{ "6", 6},
-	{ "raid10", 10},
-	{ "10", 10},
-	{ NULL, 0}
-};
-
 #ifndef MDASSEMBLE_AUTO
 /* from mdopen.c */
 int open_mddev(char *dev, int report_errors/*unused*/)
 {
 	int mdfd = open(dev, O_RDWR);
 	if (mdfd < 0)
-		fprintf(stderr, Name ": error opening %s: %s\n",
+		pr_err("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",
+		pr_err("%s does not appear to be an md device\n",
 			dev);
 		close(mdfd);
 		mdfd = -1;
@@ -90,7 +68,7 @@ int force = 0;
 int main(int argc, char *argv[]) {
 	struct mddev_ident *array_list =  conf_get_ident(NULL);
 	if (!array_list) {
-		fprintf(stderr, Name ": No arrays found in config file\n");
+		pr_err("No arrays found in config file\n");
 		rv = 1;
 	} else
 		for (; array_list; array_list = array_list->next) {
@@ -105,9 +83,9 @@ int main(int argc, char *argv[]) {
 			if (mdfd >= 0)
 				close(mdfd);
 			rv |= Assemble(array_list->st, array_list->devname,
-				       array_list, NULL, NULL,
+				       array_list, NULL, NULL, 0,
 				       readonly, runstop, NULL, NULL, 0,
-				       verbose, force);
+				       verbose, force, 1);
 		}
 	return rv;
 }