logging: add trailing newline to all strings

[elogind.git] / extras / volume_id / lib / lvm.c

diff --git a/extras/volume_id/lib/lvm.c b/extras/volume_id/lib/lvm.c
index 727204280b3fd67edeb9ce0c784362e039a090bf..d234113d7798c9ca72db764fdffcfb3318fd0a14 100644 (file)
--- a/extras/volume_id/lib/lvm.c
+++ b/extras/volume_id/lib/lvm.c
@@ -38,15 +38,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;
 
-       info("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 +71,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 +95,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;