From: Neil Brown <neilb@suse.de>
Date: Thu, 18 Aug 2005 04:25:35 +0000 (+0000)
Subject: Print descriptive level when warning about pre-existing arrays.
X-Git-Tag: mdadm-2.0~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d078d77c285efa00643b45efbe95c48f21221ea7;p=thirdparty%2Fmdadm.git

Print descriptive level when warning about pre-existing arrays.

Use map_num to get the name, so 'linear' doens't appear as '-1'.

Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
---

diff --git a/util.c b/util.c
index b4c1d5ee..db4fbf38 100644
--- a/util.c
+++ b/util.c
@@ -229,6 +229,7 @@ int check_raid(int fd, char *name)
 	struct mdinfo info;
 	struct mddev_ident_s ident;
 	time_t crtime;
+	char *level;
 	struct supertype *st = guess_super(fd);
 
 	if (!st) return 0;
@@ -239,8 +240,10 @@ int check_raid(int fd, char *name)
 	st->ss->getinfo_super(&info, &ident, super);
 	free(super);
 	crtime = info.array.ctime;
-	fprintf(stderr, "    level=%d devices=%d ctime=%s",
-		info.array.level, info.array.raid_disks, ctime(&crtime));
+	level = map_num(pers, info.array.level);
+	if (!level) level = "-unknown-";
+	fprintf(stderr, "    level=%s devices=%d ctime=%s",
+		level, info.array.raid_disks, ctime(&crtime));
 	return 1;
 }