search for: e8e7b58

..., if ntfsprogs is available invoke `ntfslabel` to get the label of ntfs filesystems. Related to RHBZ#1164708. --- daemon/blkid.c | 2 ++ daemon/daemon.h | 3 +++ daemon/ntfs.c | 24 ++++++++++++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/daemon/blkid.c b/daemon/blkid.c index e8e7b58..1ac42b4 100644 --- a/daemon/blkid.c +++ b/daemon/blkid.c @@ -82,6 +82,8 @@ do_vfs_label (const mountable_t *mountable) if (type) { if (STREQ (type, "btrfs") && optgroup_btrfs_available ()) return btrfs_get_label (mountable->device); + if (STREQ (type, "n...

blkid(1) (or actually, libblkid) seems to handle file system labels up to 127 characters. Considering that btrfs labels can be up to 255 characters, this means long labels are not read correctly (i.e. get truncated) by blkid. Get the file system type, and if btrfs is available invoke `btrfs filesystem` to get the label of btrfs file systems. --- daemon/blkid.c | 6 ++++++ daemon/btrfs.c | 24

...able invoke `btrfs filesystem` to get the label of btrfs filesystems. Related to RHBZ#1164708. --- daemon/blkid.c | 8 ++++++++ daemon/btrfs.c | 24 ++++++++++++++++++++++++ daemon/daemon.h | 3 +++ 3 files changed, 35 insertions(+) diff --git a/daemon/blkid.c b/daemon/blkid.c index b98c155..e8e7b58 100644 --- a/daemon/blkid.c +++ b/daemon/blkid.c @@ -26,6 +26,7 @@ #include "daemon.h" #include "actions.h" +#include "optgroups.h" GUESTFSD_EXT_CMD(str_blkid, blkid); @@ -76,6 +77,13 @@ do_vfs_type (const mountable_t *mountable) char * do_vfs_label (const m...