libvolume_id: read ufs2 label

Taken from the FreeBSD HAL repository.

diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile
index f53e5f11416419d72afe426594559ca92551473c..e5fd5fcddddf91803330dc2e1a8b9c26000d5cec 100644 (file)
--- a/extras/volume_id/lib/Makefile
+++ b/extras/volume_id/lib/Makefile
@@ -13,7 +13,7 @@ INSTALL_DATA  = ${INSTALL} -m 644
 INSTALL_LIB = ${INSTALL} -m 755
 
 SHLIB_CUR = 0
-SHLIB_REV = 68
+SHLIB_REV = 69
 SHLIB_AGE = 0
 SHLIB = libvolume_id.so.$(SHLIB_CUR).$(SHLIB_REV).$(SHLIB_AGE)
 

diff --git a/extras/volume_id/lib/ufs.c b/extras/volume_id/lib/ufs.c
index 2713a63d4d3a832f886eb3a02167e0833e02ea5d..4ace8c99fd70e36fdf1d0eeda2ef9209c1df159c 100644 (file)
--- a/extras/volume_id/lib/ufs.c
+++ b/extras/volume_id/lib/ufs.c
@@ -205,6 +205,18 @@ int volume_id_probe_ufs(struct volume_id *id, uint64_t off, uint64_t size)
 found:
        volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
        id->type = "ufs";
+       switch (magic) {
+       case UFS_MAGIC:
+               strcpy(id->type_version, "1");
+               break;
+       case UFS2_MAGIC:
+               strcpy(id->type_version, "2");
+               volume_id_set_label_raw(id, ufs->fs_u11.fs_u2.fs_volname, 32);
+               volume_id_set_label_string(id, ufs->fs_u11.fs_u2.fs_volname, 32);
+               break;
+       default:
+               break;
+       }
 
        return 0;
 }