Probe partitions to get filesystem type

This fixes problems with LUKS partitions not being detected

(cherry picked from commit 30c008d551)
pull/16/head
Timothy Pearson 8 years ago committed by Slávek Banko
parent f66944e531
commit dc7e40a1a9

@ -2553,14 +2553,12 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist
parentsyspath.truncate(parentsyspath.findRev("/")); parentsyspath.truncate(parentsyspath.findRev("/"));
parentdisk = static_cast<TDEStorageDevice*>(findBySystemPath(parentsyspath)); parentdisk = static_cast<TDEStorageDevice*>(findBySystemPath(parentsyspath));
} }
disktype = classifyDiskType(dev, devicenode, devicebus, devicetypestring, systempath, devicevendor, devicemodel, filesystemtype, devicedriver);
if (parentdisk) { if (parentdisk) {
// Set partition disk type and status based on the parent device // Set partition disk type and status based on the parent device
disktype = parentdisk->diskType(); disktype = disktype | parentdisk->diskType();
diskstatus = diskstatus | parentdisk->diskStatus(); diskstatus = diskstatus | parentdisk->diskStatus();
} }
else {
disktype = classifyDiskType(dev, devicenode, devicebus, devicetypestring, systempath, devicevendor, devicemodel, filesystemtype, devicedriver);
}
sdevice->internalSetDiskType(disktype); sdevice->internalSetDiskType(disktype);
device = classifyUnknownDeviceByExternalRules(dev, device, true); // Check external rules for possible subtype overrides device = classifyUnknownDeviceByExternalRules(dev, device, true); // Check external rules for possible subtype overrides
disktype = sdevice->diskType(); // The type can be overridden by an external rule disktype = sdevice->diskType(); // The type can be overridden by an external rule

Loading…
Cancel
Save