From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 12 Aug 2014 13:14:45 +0000 (+0200)
Subject: installer: Downgrade RAID metadata format to 1.0.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7b4790d3fc1620a1e7e0167227d0cca9e214ddc1;p=people%2Fms%2Fipfire-2.x.git

installer: Downgrade RAID metadata format to 1.0.
---

diff --git a/src/installer/hw.c b/src/installer/hw.c
index 2caf2afded..52d0511817 100644
--- a/src/installer/hw.c
+++ b/src/installer/hw.c
@@ -811,10 +811,12 @@ int hw_umount_filesystems(struct hw_destination* dest, const char* prefix) {
 
 int hw_setup_raid(struct hw_destination* dest) {
 	char* cmd = NULL;
+	int r;
 
 	assert(dest->is_raid);
 
-	asprintf(&cmd, "echo \"y\" | /sbin/mdadm --create --verbose --metadata=1.2 %s", dest->path);
+	asprintf(&cmd, "echo \"y\" | /sbin/mdadm --create --verbose --metadata=%s --auto=mdp %s",
+		RAID_METADATA, dest->path);
 
 	switch (dest->raid_level) {
 		case 1:
@@ -843,7 +845,7 @@ int hw_setup_raid(struct hw_destination* dest) {
 			return r;
 	}
 
-	int r = mysystem(cmd);
+	r = mysystem(cmd);
 	free(cmd);
 
 	// Wait a moment until the device has been properly brought up
diff --git a/src/installer/hw.h b/src/installer/hw.h
index ddaceb6ef6..48d24bf47a 100644
--- a/src/installer/hw.h
+++ b/src/installer/hw.h
@@ -48,6 +48,8 @@
 
 #define HW_FS_DEFAULT                 HW_FS_EXT4
 
+#define RAID_METADATA                 "1.0"
+
 #define BYTES2MB(x) ((x) / 1024 / 1024)
 #define MB2BYTES(x) ((unsigned long long)(x) * 1024 * 1024)