blkid: add lvm1

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/libs/blkid/src/probe.c b/libs/blkid/src/probe.c
index 7324be9f2ec0f54b283e0b07404f257b1682f33c..34d2e808c0da417ef1d391924c21d488340dd8e6 100644 (file)
--- a/libs/blkid/src/probe.c
+++ b/libs/blkid/src/probe.c
@@ -50,7 +50,7 @@ static const struct blkid_idinfo *idinfos[] =
        &adraid_idinfo,
        &jmraid_idinfo,
        &lvm2_idinfo,
-       /* TODO: lvm1 */
+       &lvm1_idinfo,
        &luks_idinfo,
 
        /* Filesystems */

diff --git a/libs/blkid/src/probers/lvm.c b/libs/blkid/src/probers/lvm.c
index e02f9048067330708a548943d57299ed6d53bfe5..3dea6d9ef2e0c49a68aa91a11be5b147ccedf3ca 100644 (file)
--- a/libs/blkid/src/probers/lvm.c
+++ b/libs/blkid/src/probers/lvm.c
@@ -115,8 +115,7 @@ static int probe_lvm2(blkid_probe pr, const struct blkid_idmag *mag)
 }
 
 
-/* NOTE: libblkid uses "lvm2pv" as a name */
-
+/* NOTE: the original libblkid uses "lvm2pv" as a name */
 const struct blkid_idinfo lvm2_idinfo =
 {
        .name           = "LVM2_member",
@@ -132,4 +131,15 @@ const struct blkid_idinfo lvm2_idinfo =
        }
 };
 
+const struct blkid_idinfo lvm1_idinfo =
+{
+       .name           = "LVM1_member",
+       .usage          = BLKID_USAGE_RAID,
+       .magics         =
+       {
+               { .magic = "HM", .len = 2, .sboff = 0x400 },
+               { NULL }
+       }
+};
+
 

diff --git a/libs/blkid/src/probers/probers.h b/libs/blkid/src/probers/probers.h
index cdf0682ec51fdf5758b73140588ed01390ae5c93..74c2d34e68401e3eba7a60fa6093672f41d61aa3 100644 (file)
--- a/libs/blkid/src/probers/probers.h
+++ b/libs/blkid/src/probers/probers.h
@@ -50,6 +50,7 @@ extern const struct blkid_idinfo iso9660_idinfo;
 extern const struct blkid_idinfo udf_idinfo;
 extern const struct blkid_idinfo vfat_idinfo;
 extern const struct blkid_idinfo lvm2_idinfo;
+extern const struct blkid_idinfo lvm1_idinfo;
 extern const struct blkid_idinfo luks_idinfo;
 extern const struct blkid_idinfo highpoint37x_idinfo;
 extern const struct blkid_idinfo highpoint45x_idinfo;