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

[partition] Use config object in ChoicePage

Browse Source
This commit is contained in:
Adriaan de Groot 2022-11-05 22:19:24 +01:00
parent 859569e156
commit 8c8f2a14b6
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/partition/gui/ChoicePage.cpp
View File

@ -496,8 +496,7 @@ ChoicePage::applyActionChoice( InstallChoice choice )
auto gs = Calamares::JobQueue::instance()->globalStorage(); auto gs = Calamares::JobQueue::instance()->globalStorage();
PartitionActions::Choices::AutoPartitionOptions options { gs->value( "defaultPartitionTableType" ).toString(), PartitionActions::Choices::AutoPartitionOptions options { gs->value( "defaultPartitionTableType" ).toString(),
m_config->eraseFsType(), m_config->eraseFsType(),
// TODO: LUKS m_config->luksFileSystemType(),
Config::luksGenerationNames().find(gs->value( "luksFileSystemType" ).toString(), Config::LuksGeneration::Luks1),
m_encryptWidget->passphrase(), m_encryptWidget->passphrase(),
gs->value( "efiSystemPartition" ).toString(), gs->value( "efiSystemPartition" ).toString(),
CalamaresUtils::GiBtoBytes( CalamaresUtils::GiBtoBytes(
@ -862,8 +861,7 @@ ChoicePage::doReplaceSelectedPartition( const QModelIndex& current )
selectedPartition, selectedPartition,
{ gs->value( "defaultPartitionType" ).toString(), { gs->value( "defaultPartitionType" ).toString(),
gs->value( "defaultFileSystemType" ).toString(), gs->value( "defaultFileSystemType" ).toString(),
// TODO: LUKS m_config->luksFileSystemType(),
Config::luksGenerationNames().find(gs->value( "luksFileSystemType" ).toString(), Config::LuksGeneration::Luks1),
m_encryptWidget->passphrase() } ); m_encryptWidget->passphrase() } );
Partition* homePartition = findPartitionByPath( { selectedDevice() }, *homePartitionPath ); Partition* homePartition = findPartitionByPath( { selectedDevice() }, *homePartitionPath );