From dc7e40a1a9fcb84e00a3fc24e9dfea3718b192f2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 5 Sep 2016 12:29:22 -0500 Subject: [PATCH] Probe partitions to get filesystem type This fixes problems with LUKS partitions not being detected (cherry picked from commit 30c008d5512bf83039d2e24d2e737303f68a42af) --- tdecore/tdehw/tdehardwaredevices.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tdecore/tdehw/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp index b0706a2ef..222bf41d5 100644 --- a/tdecore/tdehw/tdehardwaredevices.cpp +++ b/tdecore/tdehw/tdehardwaredevices.cpp @@ -2553,14 +2553,12 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist parentsyspath.truncate(parentsyspath.findRev("/")); parentdisk = static_cast(findBySystemPath(parentsyspath)); } + disktype = classifyDiskType(dev, devicenode, devicebus, devicetypestring, systempath, devicevendor, devicemodel, filesystemtype, devicedriver); if (parentdisk) { // Set partition disk type and status based on the parent device - disktype = parentdisk->diskType(); + disktype = disktype | parentdisk->diskType(); diskstatus = diskstatus | parentdisk->diskStatus(); } - else { - disktype = classifyDiskType(dev, devicenode, devicebus, devicetypestring, systempath, devicevendor, devicemodel, filesystemtype, devicedriver); - } sdevice->internalSetDiskType(disktype); device = classifyUnknownDeviceByExternalRules(dev, device, true); // Check external rules for possible subtype overrides disktype = sdevice->diskType(); // The type can be overridden by an external rule