diff options
| author | Andreas Dilger | 2010-03-11 15:16:46 +0100 |
|---|---|---|
| committer | Karel Zak | 2010-03-11 15:19:44 +0100 |
| commit | a1fbeb3df35d1441c4ef64ea7e04c2b1fda38ba2 (patch) | |
| tree | 74202540a5ea4ade6f0b3a7e56cb6e879ac98ed9 /tests/expected/blkid/low-probe-zfs | |
| parent | libblkid: prevent overflow in BeFS (diff) | |
| download | kernel-qcow2-util-linux-a1fbeb3df35d1441c4ef64ea7e04c2b1fda38ba2.tar.gz kernel-qcow2-util-linux-a1fbeb3df35d1441c4ef64ea7e04c2b1fda38ba2.tar.xz kernel-qcow2-util-linux-a1fbeb3df35d1441c4ef64ea7e04c2b1fda38ba2.zip | |
libblkid: improve ZFS detection and add LABEL and UUID extraction
Improve ZFS uberblock detection to loop over multiple uberblocks,
and detect at least 4 magic values, to avoid random collisions.
It doesn't yet probe the VDEV LABEL at the end of the device, though
it wouldn't be too hard to add it at this point if needed.
Add extraction of the pool name (as LABEL), the VDEV (block device)
guid as UUID_SUB, and pool_guid (volume) as UUID from the nvlist in
the VDEV LABEL. Do simple sanity checking on the nvlist data values
to avoid overflowing the buffer if they are corrupt in any way.
[kzak@redhat.com: - use %PRIu64 instead %llu]
Signed-off-by: Andreas Dilger <adilger@sun.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/expected/blkid/low-probe-zfs')
| -rw-r--r-- | tests/expected/blkid/low-probe-zfs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/expected/blkid/low-probe-zfs b/tests/expected/blkid/low-probe-zfs index 8159f18c1..bd803da96 100644 --- a/tests/expected/blkid/low-probe-zfs +++ b/tests/expected/blkid/low-probe-zfs @@ -1,3 +1,9 @@ -ID_FS_TYPE=zfs -ID_FS_USAGE=filesystem +ID_FS_LABEL_ENC=tank +ID_FS_LABEL=tank +ID_FS_TYPE=zfs_member +ID_FS_USAGE=raid +ID_FS_UUID=1782036546311300980 +ID_FS_UUID_ENC=1782036546311300980 +ID_FS_UUID_SUB=13179280127379850514 +ID_FS_UUID_SUB_ENC=13179280127379850514 ID_FS_VERSION=8 |