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

Merge pull request #945 from cjlcarvalho/master

Browse Source 
- Switch to enum types
 - Ignore LVM
 - Check LUKS support

Builds locally in my Manjaro test-box and kpmcore 3.3.0
This commit is contained in:
Adriaan de Groot 2018-05-10 13:39:58 +02:00 committed by GitHub
commit ccdfe53201
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
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" )
)
{

4
src/modules/partition/gui/CreatePartitionDialog.cpp
View File

@ -261,7 +261,9 @@ CreatePartitionDialog::updateMountPointUi()
FileSystem::Type type = FileSystem::typeForName( m_ui->fsComboBox->currentText() );
enabled = !s_unmountableFS.contains( type );
if ( FS::luks::canEncryptType( type ) )
if ( FileSystemFactory::map()[FileSystem::Type::Luks]->supportCreate() &&
FS::luks::canEncryptType( type ) &&
!m_role.has( PartitionRole::Extended ) )
{
m_ui->encryptWidget->show();
m_ui->encryptWidget->reset();