Merge branch 'calamares' into fixfsreplace

This commit is contained in:
dalto 2023-02-18 15:40:46 -06:00
commit ba33908f9f

View File

@ -870,7 +870,7 @@ ChoicePage::doReplaceSelectedPartition( const QModelIndex& current )
selectedPartition, selectedPartition,
{ gs->value( "defaultPartitionType" ).toString(), { gs->value( "defaultPartitionType" ).toString(),
m_config->replaceModeFilesystem(), m_config->replaceModeFilesystem(),
gs->value( "luksFileSystemType" ).toString(), m_config->luksFileSystemType(),
m_encryptWidget->passphrase() } ); m_encryptWidget->passphrase() } );
Partition* homePartition = findPartitionByPath( { selectedDevice() }, *homePartitionPath ); Partition* homePartition = findPartitionByPath( { selectedDevice() }, *homePartitionPath );