Branch: master

30c008d5 2016-09-05 12:29:22 Timothy Pearson
Probe partitions to get filesystem type
This fixes problems with LUKS partitions not being detected
M tdecore/tdehw/tdehardwaredevices.cpp
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,13 +2616,11 @@
 				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