X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fvolume_id%2Flib%2Flinux_raid.c;h=3c2e86e422490f08ad6b4bf5deb0984442435e90;hp=ff2c47c4732f0a4f39f6c3a6cbff84c09d2187c1;hb=9e5920842b0b414e78b04ddd40fb4cf29b0d855c;hpb=6bdec550afa1e3485233dac1e0c6727e5548e7f7

diff --git a/extras/volume_id/lib/linux_raid.c b/extras/volume_id/lib/linux_raid.c
index ff2c47c47..3c2e86e42 100644
--- a/extras/volume_id/lib/linux_raid.c
+++ b/extras/volume_id/lib/linux_raid.c
@@ -131,10 +131,12 @@ static int volume_id_probe_linux_raid1(struct volume_id *id, uint64_t off, uint6
 	if (le32_to_cpu(mdp1->magic) != MD_SB_MAGIC)
 		return -1;
 
+	if (le32_to_cpu(mdp1->major_version) != 1)
+		return -1;
+
 	volume_id_set_uuid(id, mdp1->set_uuid, 0, UUID_FOURINT);
 	volume_id_set_label_raw(id, mdp1->set_name, 32);
 	volume_id_set_label_string(id, mdp1->set_name, 32);
-	snprintf(id->type_version, sizeof(id->type_version)-1, "%u", le32_to_cpu(mdp1->major_version));
 	volume_id_set_usage(id, VOLUME_ID_RAID);
 	id->type = "linux_raid_member";
 	return 0;
@@ -151,16 +153,22 @@ int volume_id_probe_linux_raid(struct volume_id *id, uint64_t off, uint64_t size
 
 	/* version 1.0 at the end of the device */
 	sboff = (size & ~(0x1000 - 1)) - 0x2000;
-	if (volume_id_probe_linux_raid1(id, off + sboff, size) == 0)
+	if (volume_id_probe_linux_raid1(id, off + sboff, size) == 0) {
+		strcpy(id->type_version, "1.0");
 		return 0;
+	}
 
 	/* version 1.1 at the start of the device */
-	if (volume_id_probe_linux_raid1(id, off, size) == 0)
+	if (volume_id_probe_linux_raid1(id, off, size) == 0) {
+		strcpy(id->type_version, "1.1");
 		return 0;
+	}
 
 	/* version 1.2 at 4k offset from the start */
-	if (volume_id_probe_linux_raid1(id, off + 0x1000, size) == 0)
+	if (volume_id_probe_linux_raid1(id, off + 0x1000, size) == 0) {
+		strcpy(id->type_version, "1.2");
 		return 0;
+	}
 
 	return -1;
 }