Merge branch 'calamares:calamares' into calamares

This commit is contained in:
Sohrab Behdani 2025-02-10 17:53:39 +03:30 committed by GitHub
commit 4de89b2999
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -40,6 +40,7 @@
#include "utils/Logger.h"
#include "utils/Retranslator.h"
#include "utils/Units.h"
#include "utils/String.h"
#include "widgets/PrettyRadioButton.h"
#include <kpmcore/core/device.h>
@ -691,6 +692,13 @@ ChoicePage::efiIndex()
void
ChoicePage::onLeave()
{
Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
if ( m_encryptWidget->state() == EncryptWidget::Encryption::Confirmed ) {
gs->insert( "passphrase", Calamares::String::obscure( m_encryptWidget->passphrase() ) );
}else{
gs->insert( "passphrase", "" );
}
if ( m_config->installChoice() == InstallChoice::Alongside )
{
if ( m_afterPartitionSplitterWidget->splitPartitionSize() >= 0