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

Having a mounted partition should not disqualify the entire device.

Browse Source 
FIXES #780
(should reopen #639 for double-checking)
This commit is contained in:
Adriaan de Groot 2017-08-28 06:01:11 -04:00 committed by Philip
parent 5100f32ebe
commit a776284dfa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/partition/core/DeviceList.cpp
View File

@ -52,8 +52,9 @@ hasRootPartition( Device* device )
return false; return false;
} }
/* Unused */
static bool static bool
isMounted( Device* device ) hasMountedPartitions( Device* device )
{ {
cDebug() << "Checking for mounted partitions in" << device->deviceNode(); cDebug() << "Checking for mounted partitions in" << device->deviceNode();
for ( auto it = PartitionIterator::begin( device ); it != PartitionIterator::end( device ); ++it ) for ( auto it = PartitionIterator::begin( device ); it != PartitionIterator::end( device ); ++it )
@ -128,8 +129,7 @@ QList< Device* > getDevices( DeviceType which, qint64 minimumSize )
} }
else if ( writableOnly && ( else if ( writableOnly && (
hasRootPartition( *it ) || hasRootPartition( *it ) ||
isIso9660( *it ) || isIso9660( *it ) )
isMounted( *it ) )
) )
{ {
cDebug() << " .. Removing" << it; cDebug() << " .. Removing" << it;