From f561f0459174f98af80e43da6b2b96b8c202f86c Mon Sep 17 00:00:00 2001 From: Caio Carvalho Date: Thu, 3 May 2018 14:50:13 -0300 Subject: [PATCH] [partition] Changing PartUtils::getDevices to ignore devices that aren't of Disk_Device type. --- src/modules/partition/core/DeviceList.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/partition/core/DeviceList.cpp b/src/modules/partition/core/DeviceList.cpp index 1a070773e..3695193b4 100644 --- a/src/modules/partition/core/DeviceList.cpp +++ b/src/modules/partition/core/DeviceList.cpp @@ -129,7 +129,12 @@ QList< Device* > getDevices( DeviceType which, qint64 minimumSize ) // Remove the device which contains / from the list for ( DeviceList::iterator it = devices.begin(); it != devices.end(); ) - if ( ! ( *it ) || + if ( (*it)->type() != Device::Type::Disk_Device ) + { + cDebug() << " .. Removing device that is not a Disk_Device from list " << it; + it = erase(devices, it ); + } + else if ( ! ( *it ) || ( *it )->deviceNode().startsWith( "/dev/zram" ) ) { @@ -152,11 +157,6 @@ QList< Device* > getDevices( DeviceType which, qint64 minimumSize ) cDebug() << " .. Removing too-small" << it; it = erase(devices, it ); } - else if ( (*it)->type() == Device::LVM_Device ) - { - cDebug() << " .. Removing LVM device from list " << it; - it = erase(devices, it ); - } else ++it;