summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2016-09-05 17:29:22 (GMT)
committer Timothy Pearson <kb9vqf@pearsoncomputing.net>2016-09-05 17:29:22 (GMT)
commit30c008d5512bf83039d2e24d2e737303f68a42af (patch)
tree6a400a3ba9ed7d42c6e5b0536c9e8f010821e749
parentb18bff9ad82dd217efa1adefb3ab8308b0344c49 (diff)
downloadtdelibs-30c008d5.zip
tdelibs-30c008d5.tar.gz
Probe partitions to get filesystem type
This fixes problems with LUKS partitions not being detected
-rw-r--r--tdecore/tdehw/tdehardwaredevices.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/tdecore/tdehw/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp
index 9ef0059..257a22a 100644
--- a/tdecore/tdehw/tdehardwaredevices.cpp
+++ b/tdecore/tdehw/tdehardwaredevices.cpp
@@ -2616,14 +2616,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