]> git.ipfire.org Git - thirdparty/util-linux.git/commit
libblkid: udf: Fix reporting UDF 2.60 revision for Mac OS X disks
authorPali Rohár <pali.rohar@gmail.com>
Sun, 15 Dec 2019 11:55:41 +0000 (12:55 +0100)
committerPali Rohár <pali.rohar@gmail.com>
Sun, 15 Dec 2019 11:55:41 +0000 (12:55 +0100)
commit92fc937ba448eb0e0bc07ec4eeb7f44995c5346a
tree357221a2214c75ec5b1db87cc356cd3876aca790
parent3d3280ef159087e4a96f59ca513a543900089ed0
libblkid: udf: Fix reporting UDF 2.60 revision for Mac OS X disks

Apple's newfs_udf, when creating UDF 2.60 disks, sets value 2.50 into
both Minimum UDF Read Revision and Minimum UDF Write Revision fields in
LVIDIU. And sets 2.60 value into UDF revision field in LVD descriptor.

So to correctly parse and set blkid ID_FS_VERSION field, use maximum value
from Minimum UDF Read Revision in LVIDIU, Minimum UDF Write Revision in
LVDIU and UDF revision in LVD descriptor.

This commit also adds a testing UDF 2.60 disk image with 4K sectors created
by Apple's newfs_udf to verify that ID_FS_VERSION is set correctly to 2.60.
libblkid/src/superblocks/udf.c
tests/expected/blkid/low-probe-udf-hdd-macosx-2.60-4096 [new file with mode: 0644]
tests/ts/blkid/images-fs/udf-hdd-macosx-2.60-4096.img.xz [new file with mode: 0644]