volume_id: support sub-uuid's and plug in btrfs device uuid

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

diff --git a/extras/volume_id/lib/btrfs.c b/extras/volume_id/lib/btrfs.c
index 09b03a68dc4d57e25fecc24c79c65caf3b2b4b17..5ef979f2f07f9c01a55741c65fbf9c721db016d9 100644 (file)
--- a/extras/volume_id/lib/btrfs.c
+++ b/extras/volume_id/lib/btrfs.c
@@ -93,6 +93,7 @@ int volume_id_probe_btrfs(struct volume_id *id, uint64_t off, uint64_t size)
        if (memcmp(bfs->magic, "_BHRfS_M", 8) != 0)
                return -1;
        volume_id_set_uuid(id, bfs->fsid, 0, UUID_DCE);
+       volume_id_set_uuid_sub(id, bfs->dev_item.uuid, 0, UUID_DCE);
        volume_id_set_label_raw(id, bfs->label, 256);
        volume_id_set_label_string(id, bfs->label, 256);
        volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);