blkid: Add support for returning labels for UDF filesystems

Addresses-Sourceforge-Bug: #1886394

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/lib/blkid/probe.c b/lib/blkid/probe.c
index 917447b6db288fbb5e002041606050cbc8e98a53..00cf850713c9d21244c9d19e17d701b4a270b5dd 100644 (file)
--- a/lib/blkid/probe.c
+++ b/lib/blkid/probe.c
@@ -905,7 +905,7 @@ static int probe_udf(struct blkid_probe *probe,
                   NSR02 for UDF 1.50
                   NSR03 for UDF 2.00 */
                if (!memcmp(isosb->vd_id, "NSR0", 4))
-                       return 0;
+                       return probe_iso9660(probe, id, buf);
                for (m = udf_magic; *m; m++)
                        if (!memcmp(*m, isosb->vd_id, 5))
                                break;

diff --git a/lib/blkid/tests/udf.img.bz2 b/lib/blkid/tests/udf.img.bz2
new file mode 100644 (file)
index 0000000..bd2deb0
Binary files /dev/null and b/lib/blkid/tests/udf.img.bz2 differ

diff --git a/lib/blkid/tests/udf.results b/lib/blkid/tests/udf.results
new file mode 100644 (file)
index 0000000..1f7aa48
--- /dev/null
+++ b/lib/blkid/tests/udf.results
@@ -0,0 +1,2 @@
+TYPE='udf'
+LABEL='test-udf'