napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[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 committed by Philip
parent 4121a108ab
commit a48b1eacdd
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 // Remove the device which contains / from the list
for ( DeviceList::iterator it = devices.begin(); it != devices.end(); ) 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" ) ( *it )->deviceNode().startsWith( "/dev/zram" )
) )
{ {
@ -152,11 +157,6 @@ QList< Device* > getDevices( DeviceType which, qint64 minimumSize )
cDebug() << " .. Removing too-small" << it; cDebug() << " .. Removing too-small" << it;
it = erase(devices, it ); it = erase(devices, it );
} }
else if ( (*it)->type() == Device::LVM_Device )
{
cDebug() << " .. Removing LVM device from list " << it;
it = erase(devices, it );
}
else else
++it; ++it;