TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

tdehw lib: fixed detection of mountable optical disks with incomplete

Browse Source 
partition table.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 99b855062b)
r14.0.x
Michele Calgaro 4 years ago
parent 8fde8b8e3b
commit 383d54fdcf
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File

14
tdecore/tdehw/tdehardwaredevices.cpp
Unescape View File

@ -2699,7 +2699,8 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist
diskstatus = diskstatus | TDEDiskDeviceStatus::Hotpluggable; diskstatus = diskstatus | TDEDiskDeviceStatus::Hotpluggable;
} }
if ((filesystemtype.upper() != "CRYPTO_LUKS") && (filesystemtype.upper() != "CRYPTO") && (filesystemtype.upper() != "SWAP") && (!filesystemtype.isEmpty())) { if ((!filesystemtype.isEmpty()) && (filesystemtype.upper() != "CRYPTO_LUKS") &&
(filesystemtype.upper() != "CRYPTO") && (filesystemtype.upper() != "SWAP")) {
diskstatus = diskstatus | TDEDiskDeviceStatus::ContainsFilesystem; diskstatus = diskstatus | TDEDiskDeviceStatus::ContainsFilesystem;
} }
else { else {
@ -2724,11 +2725,12 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist
diskstatus = diskstatus & ~TDEDiskDeviceStatus::Mountable; diskstatus = diskstatus & ~TDEDiskDeviceStatus::Mountable;
} }
// Partition tables cannot be mounted // Partition tables cannot be mounted
if ((TQString(udev_device_get_property_value(dev, "ID_PART_TABLE_TYPE")) != "") if ((!TQString(udev_device_get_property_value(dev, "ID_PART_TABLE_TYPE")).isEmpty()) &&
&& ((TQString(udev_device_get_property_value(dev, "ID_PART_ENTRY_TYPE")).isEmpty()) ((TQString(udev_device_get_property_value(dev, "ID_PART_ENTRY_TYPE")).isEmpty() &&
|| (TQString(udev_device_get_property_value(dev, "ID_PART_ENTRY_TYPE")) == "0x5") !(diskstatus & TDEDiskDeviceStatus::ContainsFilesystem)) ||
|| (TQString(udev_device_get_property_value(dev, "ID_PART_ENTRY_TYPE")) == "0xf") (TQString(udev_device_get_property_value(dev, "ID_PART_ENTRY_TYPE")) == "0x5") ||
|| (TQString(udev_device_get_property_value(dev, "ID_FS_USAGE")).upper() == "RAID"))) { (TQString(udev_device_get_property_value(dev, "ID_PART_ENTRY_TYPE")) == "0xf") ||
(TQString(udev_device_get_property_value(dev, "ID_FS_USAGE")).upper() == "RAID"))) {
diskstatus = diskstatus & ~TDEDiskDeviceStatus::Mountable; diskstatus = diskstatus & ~TDEDiskDeviceStatus::Mountable;
} }
// If certain disk types do not report the presence of a filesystem, they are likely not mountable // If certain disk types do not report the presence of a filesystem, they are likely not mountable

Write Preview
Loading…
Cancel
Save