applications/calamares
3
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-02-24 02:45:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[partition] Changing PartUtils::getDevices to ignore devices that aren't of Disk_Device type.

Browse source
This commit is contained in:
Caio Carvalho 2018-05-03 14:50:13 -03:00
parent 8726b70574
commit f561f04591
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/modules/partition/core/DeviceList.cpp
View file

@ -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;