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

[partition] Don't offer whole disk encryption when zfs is selected

Browse Source
This commit is contained in:
dalto 2022-05-13 16:24:15 -05:00
parent 14129fedb6
commit 42841a217c
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -457,7 +457,6 @@ ChoicePage::continueApplyDeviceChoice()
Q_EMIT deviceChosen(); Q_EMIT deviceChosen();
} }
void void
ChoicePage::onActionChanged() ChoicePage::onActionChanged()
{ {
@ -466,6 +465,15 @@ ChoicePage::onActionChanged()
{ {
applyActionChoice( m_config->installChoice() ); applyActionChoice( m_config->installChoice() );
} }
// Whole disk encryption isn't implemented for zfs so disable the option for now
if ( m_eraseFsTypesChoiceComboBox != nullptr && m_enableEncryptionWidget ) {
if ( m_eraseFsTypesChoiceComboBox->currentText() == "zfs" ) {
m_encryptWidget->hide();
} else {
m_encryptWidget->show();
}
}
} }
void void

5
src/modules/partition/gui/EncryptWidget.cpp
View File

@ -85,6 +85,11 @@ EncryptWidget::state() const
return m_state; return m_state;
} }
void EncryptWidget::setChecked(bool checked)
{
m_ui->m_encryptCheckBox->setChecked(checked);
}
void void
EncryptWidget::setText( const QString& text ) EncryptWidget::setText( const QString& text )

1
src/modules/partition/gui/EncryptWidget.h
View File

@ -36,6 +36,7 @@ public:
void reset(); void reset();
Encryption state() const; Encryption state() const;
void setChecked( bool checked );
void setText( const QString& text ); void setText( const QString& text );
QString passphrase() const; QString passphrase() const;