volume_id: enable GFS probing code, add LABEL support

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

diff --git a/extras/volume_id/lib/volume_id.c b/extras/volume_id/lib/volume_id.c
index 7c68fb1ef9fdb42cb77c2e3164982949a4ad2a36..baeaa9f74e0def5d444ee63747b8fbfc92616f2d 100644 (file)
--- a/extras/volume_id/lib/volume_id.c
+++ b/extras/volume_id/lib/volume_id.c
@@ -70,6 +70,8 @@ static const struct prober prober_filesystem[] = {
        { volume_id_probe_hpfs, { "hpfs", } },
        { volume_id_probe_sysv, { "sysv", "xenix", } },
        { volume_id_probe_minix, { "minix",  } },
+       { volume_id_probe_gfs, { "gfs", } },
+       { volume_id_probe_gfs2, { "gfs2", } },
        { volume_id_probe_ocfs1, { "ocfs1", } },
        { volume_id_probe_ocfs2, { "ocfs2", } },
        { volume_id_probe_vxfs, { "vxfs", } },
@@ -358,7 +360,7 @@ int volume_id_probe_raid(struct volume_id *id, uint64_t off, uint64_t size)
        if (!device_is_readable(id, off))
                return -1;
 
-       info("probing at offset 0x%llx, size 0x%llx",
+       info("probing at offset 0x%llx, size 0x%llx\n",
            (unsigned long long) off, (unsigned long long) size);
 
        for (i = 0; i < ARRAY_SIZE(prober_raid); i++)
@@ -392,7 +394,7 @@ int volume_id_probe_filesystem(struct volume_id *id, uint64_t off, uint64_t size
        if (!device_is_readable(id, off))
                return -1;
 
-       info("probing at offset 0x%llx, size 0x%llx",
+       info("probing at offset 0x%llx, size 0x%llx\n",
            (unsigned long long) off, (unsigned long long) size);
 
        for (i = 0; i < ARRAY_SIZE(prober_filesystem); i++)
@@ -493,7 +495,7 @@ struct volume_id *volume_id_open_node(const char *path)
 
        fd = open(path, O_RDONLY);
        if (fd < 0) {
-               dbg("unable to open '%s'", path);
+               dbg("unable to open '%s'\n", path);
                return NULL;
        }