applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-27 17:35:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Exclude loop devices with mounted children from devices list.

Browse source
This commit is contained in:
Teo Mrnjavac 2016-09-02 12:08:00 +02:00
parent b0122f25e5
commit ad219e1b8e
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/modules/partition/core/PartitionCoreModule.cpp
View file

@ -127,7 +127,10 @@ PartitionCoreModule::doInit()
// Remove the device which contains / from the list // Remove the device which contains / from the list
for ( QList< Device* >::iterator it = devices.begin(); it != devices.end(); ) for ( QList< Device* >::iterator it = devices.begin(); it != devices.end(); )
if ( hasRootPartition( *it ) || if ( hasRootPartition( *it ) ||
(*it)->deviceNode().startsWith( "/dev/zram") ) (*it)->deviceNode().startsWith( "/dev/zram") ||
( (*it)->partitionTable() &&
(*it)->partitionTable()->type() == PartitionTable::loop &&
(*it)->partitionTable()->isChildMounted() ) )
it = devices.erase( it ); it = devices.erase( it );
else else
++it; ++it;