Mirrors
/
gparted
mirror of https://gitlab.gnome.org/GNOME/gparted.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Also use libparted to probe for encrypted file systems (#148) 

Even though blkid is considered mandatory [1] GParted should still
perform reasonably when blkid is not available, provided that is not too
onerous a task.  Also use libparted file system identification inside
encryption mappings.

[1] 749a249571
    Document blkid command as a mandatory requirement (#753436)

Closes 148 - Encrypted file systems are no longer recognised
This commit is contained in:
Mike Fleetwood 2021-03-29 22:13:22 +01:00 committed by Curtis Gedak
parent 555cea10cf
commit 1adb28b0c4
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/GParted_Core.cc
View File

@ -1082,8 +1082,19 @@ FSType GParted_Core::detect_filesystem_in_encryption_mapping(const Glib::ustring
PedDevice *lp_device = NULL;
if (get_device(path, lp_device))
{
fstype = detect_filesystem(lp_device, NULL, messages);
// Run libparted partition table and file system identification. Only use
// (get the first partition) if it's a "loop" table; because GParted only
// supports one block device to one encryption mapping to one file system.
PedDisk *lp_disk = NULL;
PedPartition *lp_partition = NULL;
if (get_disk(lp_device, lp_disk) && lp_disk->type && lp_disk->type->name &&
strcmp(lp_disk->type->name, "loop") == 0 )
{
lp_partition = ped_disk_next_partition(lp_disk, NULL);
}
fstype = detect_filesystem(lp_device, lp_partition, messages);
destroy_device_and_disk(lp_device, lp_disk);
}