mirror of https://github.com/vitalif/e2fsprogs
Merge branch 'maint' into next
commit
8aa53bfa69
|
@ -95,8 +95,13 @@ Description: universally unique id library
|
|||
libuuid generates and parses 128-bit universally unique id's (UUID's).
|
||||
See RFC 4122 for more information.
|
||||
.
|
||||
This package contains the uuidd daemon which is used by libuuid as well as
|
||||
the uuidgen program.
|
||||
This package contains the uuidgen program and the uuidd daemon.
|
||||
.
|
||||
The uuidd daemon is used to generate universally unique identifiers (UUIDs),
|
||||
especially time-based UUID’s, in a secure and guaranteed-unique fashion,
|
||||
even in the face of large numbers of threads trying to grab UUID’s
|
||||
running on different CPU’s. It is used by by libuuid as well as the
|
||||
uuidgen program.
|
||||
|
||||
Package: libuuid1-udeb
|
||||
Section: debian-installer
|
||||
|
@ -213,9 +218,10 @@ Suggests: gpart, parted, e2fsck-static
|
|||
Conflicts: dump (<< 0.4b4-4), quota (<< 1.55-8.1), initscripts (<< 2.85-4), sysvinit (<< 2.85-4)
|
||||
Replaces: hurd (<= 20040301-1), libblkid1 (<< 1.38+1.39-WIP-2005.12.10-2), libuuid1 (<< 1.38+1.39-WIP-2005.12.10-2)
|
||||
Architecture: any
|
||||
Description: ext2 file system utilities and libraries
|
||||
EXT2 stands for "Extended Filesystem", version 2. It's the main
|
||||
filesystem type used for hard disks on Debian and other Linux systems.
|
||||
Description: ext2/ext3/ext4 file system utilities
|
||||
The ext2, ext3 and ext4 file systems are successors of the original ext
|
||||
("extended") file system. They are the main file system types used for
|
||||
hard disks on Debian and other Linux systems.
|
||||
.
|
||||
This package contains programs for creating, checking, and maintaining EXT2
|
||||
filesystems, and the generic `fsck' wrapper.
|
||||
This package contains programs for creating, checking, and maintaining
|
||||
ext-based file systems, and the generic fsck wrapper.
|
||||
|
|
|
@ -774,6 +774,20 @@ static int probe_jfs(struct blkid_probe *probe,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int probe_zfs(struct blkid_probe *probe, struct blkid_magic *id,
|
||||
unsigned char *buf)
|
||||
{
|
||||
char *vdev_label;
|
||||
const char *pool_name = 0;
|
||||
|
||||
/* read nvpair data for pool name, pool GUID (complex) */
|
||||
#if 0
|
||||
blkid_set_tag(probe->dev, "LABEL", pool_name, sizeof(pool_name));
|
||||
set_uuid(probe->dev, pool_guid, 0);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int probe_luks(struct blkid_probe *probe,
|
||||
struct blkid_magic *id __BLKID_ATTR((unused)),
|
||||
unsigned char *buf)
|
||||
|
@ -1094,15 +1108,6 @@ static int probe_lvm2(struct blkid_probe *probe,
|
|||
|
||||
return 0;
|
||||
}
|
||||
/*
|
||||
* BLKID_BLK_OFFS is at least as large as the highest bim_kboff defined
|
||||
* in the type_array table below + bim_kbalign.
|
||||
*
|
||||
* When probing for a lot of magics, we handle everything in 1kB buffers so
|
||||
* that we don't have to worry about reading each combination of block sizes.
|
||||
*/
|
||||
#define BLKID_BLK_OFFS 64 /* currently reiserfs */
|
||||
|
||||
/*
|
||||
* Various filesystem magics that we can check for. Note that kboff and
|
||||
* sboff are in kilobytes and bytes respectively. All magics are in
|
||||
|
@ -1153,6 +1158,10 @@ static struct blkid_magic type_array[] = {
|
|||
{ "iso9660", 32, 1, 5, "CD001", probe_iso9660 },
|
||||
{ "iso9660", 32, 9, 5, "CDROM", probe_iso9660 },
|
||||
{ "jfs", 32, 0, 4, "JFS1", probe_jfs },
|
||||
{ "zfs", 8, 0, 8, "\0\0\x02\xf5\xb0\x07\xb1\x0c", probe_zfs },
|
||||
{ "zfs", 8, 0, 8, "\x0c\xb1\x07\xb0\xf5\x02\0\0", probe_zfs },
|
||||
{ "zfs", 264, 0, 8, "\0\0\x02\xf5\xb0\x07\xb1\x0c", probe_zfs },
|
||||
{ "zfs", 264, 0, 8, "\x0c\xb1\x07\xb0\xf5\x02\0\0", probe_zfs },
|
||||
{ "hfsplus", 1, 0, 2, "BD", probe_hfsplus },
|
||||
{ "hfsplus", 1, 0, 2, "H+", 0 },
|
||||
{ "hfs", 1, 0, 2, "BD", 0 },
|
||||
|
|
Loading…
Reference in New Issue