chiark / gitweb /
libvolume_id: read ufs2 label
authorKay Sievers <kay.sievers@suse.de>
Fri, 4 Aug 2006 22:02:58 +0000 (00:02 +0200)
committerKay Sievers <kay.sievers@suse.de>
Fri, 4 Aug 2006 22:02:58 +0000 (00:02 +0200)
Taken from the FreeBSD HAL repository.

extras/volume_id/lib/Makefile
extras/volume_id/lib/ufs.c

index f53e5f1..e5fd5fc 100644 (file)
@@ -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)
 
index 2713a63..4ace8c9 100644 (file)
@@ -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;
 }