diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2016-09-05 12:29:22 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2016-09-08 19:34:08 +0200 |
| commit | dc7e40a1a9fcb84e00a3fc24e9dfea3718b192f2 (patch) | |
| tree | 96ce0753caed8bdeb0726bb424a696df94166da7 /tdecore | |
| parent | f66944e531a824d0aa8d09de5789400051df53af (diff) | |
| download | tdelibs-dc7e40a1a9fcb84e00a3fc24e9dfea3718b192f2.tar.gz tdelibs-dc7e40a1a9fcb84e00a3fc24e9dfea3718b192f2.zip | |
Probe partitions to get filesystem type
This fixes problems with LUKS partitions not being detected
(cherry picked from commit 30c008d5512bf83039d2e24d2e737303f68a42af)
Diffstat (limited to 'tdecore')
| -rw-r--r-- | tdecore/tdehw/tdehardwaredevices.cpp | 6 |
1 files 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<TDEStorageDevice*>(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 |