X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fvolume_id%2Flib%2Flvm.c;h=5dc360f65d8ce5f15cac1d4bc04b2e89c19b2e0e;hb=2603474ff9be2418900581da1af5cccc9f13cae1;hp=47d84b09686206b26be93441e383dea2f52a91b2;hpb=83cc6ab4760817509f1ed1ee429669e563f82caf;p=elogind.git

diff --git a/extras/volume_id/lib/lvm.c b/extras/volume_id/lib/lvm.c
index 47d84b096..5dc360f65 100644
--- a/extras/volume_id/lib/lvm.c
+++ b/extras/volume_id/lib/lvm.c
@@ -24,6 +24,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 struct lvm1_super_block {
@@ -38,15 +39,20 @@ struct lvm2_super_block {
 	uint8_t		type[8];
 } PACKED;
 
+struct lvm2_pv_header {
+	uint8_t		id[32];
+	uint64_t	devsize_xl;
+} PACKED;
+
 #define LVM1_SB_OFF			0x400
 #define LVM1_MAGIC			"HM"
 
-int volume_id_probe_lvm1(struct volume_id *id, uint64_t off)
+int volume_id_probe_lvm1(struct volume_id *id, uint64_t off, uint64_t size)
 {
 	const uint8_t *buf;
 	struct lvm1_super_block *lvm;
 
-	dbg("probing at offset 0x%llx", (unsigned long long) off);
+	info("probing at offset 0x%llx\n", (unsigned long long) off);
 
 	buf = volume_id_get_buffer(id, off + LVM1_SB_OFF, 0x800);
 	if (buf == NULL)
@@ -66,13 +72,14 @@ int volume_id_probe_lvm1(struct volume_id *id, uint64_t off)
 #define LVM2_LABEL_ID			"LABELONE"
 #define LVM2LABEL_SCAN_SECTORS		4
 
-int volume_id_probe_lvm2(struct volume_id *id, uint64_t off)
+int volume_id_probe_lvm2(struct volume_id *id, uint64_t off, uint64_t size)
 {
 	const uint8_t *buf;
 	unsigned int soff;
 	struct lvm2_super_block *lvm;
+	struct lvm2_pv_header *pvhdr;
 
-	dbg("probing at offset 0x%llx", (unsigned long long) off);
+	dbg("probing at offset 0x%llx\n", (unsigned long long) off);
 
 	buf = volume_id_get_buffer(id, off, LVM2LABEL_SCAN_SECTORS * 0x200);
 	if (buf == NULL)
@@ -89,8 +96,13 @@ int volume_id_probe_lvm2(struct volume_id *id, uint64_t off)
 	return -1;
 
 found:
+	dbg("found at offset 0x%x (pv hdr offset 0x%x)\n",
+	    soff, cpu_to_le32(lvm->offset_xl));
+	soff += cpu_to_le32(lvm->offset_xl);
+	pvhdr = (struct lvm2_pv_header *) &buf[soff];
 	memcpy(id->type_version, lvm->type, 8);
 	volume_id_set_usage(id, VOLUME_ID_RAID);
+	volume_id_set_uuid(id, pvhdr->id, 0, UUID_LVM);
 	id->type = "LVM2_member";
 
 	return 0;