]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
installer: Downgrade RAID metadata format to 1.0.
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 12 Aug 2014 13:14:45 +0000 (15:14 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 12 Aug 2014 13:14:45 +0000 (15:14 +0200)
src/installer/hw.c
src/installer/hw.h

index 2caf2afded06de590b0e92f7b6d6b335d9e7c639..52d0511817efbb92f58b8d8930f0114af8a0c736 100644 (file)
@@ -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
index ddaceb6ef625cc9262140935cff4c895d2f4e1d6..48d24bf47a7d3706087f10ab0c7b606cfa05a0a1 100644 (file)
@@ -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)