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

Be more explicit on why a device is winnowed from the list

Browse Source
This commit is contained in:
Adriaan de Groot 2017-09-05 03:36:03 -04:00 committed by Philip
parent 4cd564655a
commit 633f70e93e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,12 +137,14 @@ QList< Device* > getDevices( DeviceType which, qint64 minimumSize )
it = erase(devices, it ); it = erase(devices, it );
} }
else if ( writableOnly && ( else if ( writableOnly && hasRootPartition( *it ) )
hasRootPartition( *it ) ||
isIso9660( *it ) )
)
{ {
cDebug() << " .. Removing root-or-CD" << it; cDebug() << " .. Removing device with root filesystem (/) on it" << it;
it = erase(devices, it );
}
else if ( writableOnly && isIso9660( *it ) )
{
cDebug() << " .. Removing device with iso9660 filesystem (probably a CD) on it" << it;
it = erase(devices, it ); it = erase(devices, it );
} }
else if ( (minimumSize >= 0) && !( (*it)->capacity() > minimumSize ) ) else if ( (minimumSize >= 0) && !( (*it)->capacity() > minimumSize ) )