mirror of
https://github.com/parchlinux/calamares.git
synced 2025-02-22 09:55:44 -05:00
Merge branch 'calamares:calamares' into calamares
This commit is contained in:
commit
4de89b2999
1 changed files with 8 additions and 0 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue