mirror of
https://github.com/parchlinux/calamares.git
synced 2025-02-23 02:15:44 -05:00
[partition] Don't offer whole disk encryption when zfs is selected
This commit is contained in:
parent
14129fedb6
commit
42841a217c
3 changed files with 15 additions and 1 deletions
|
@ -457,7 +457,6 @@ ChoicePage::continueApplyDeviceChoice()
|
|||
Q_EMIT deviceChosen();
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
ChoicePage::onActionChanged()
|
||||
{
|
||||
|
@ -466,6 +465,15 @@ ChoicePage::onActionChanged()
|
|||
{
|
||||
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
|
||||
|
|
|
@ -85,6 +85,11 @@ EncryptWidget::state() const
|
|||
return m_state;
|
||||
}
|
||||
|
||||
void EncryptWidget::setChecked(bool checked)
|
||||
{
|
||||
m_ui->m_encryptCheckBox->setChecked(checked);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
EncryptWidget::setText( const QString& text )
|
||||
|
|
|
@ -36,6 +36,7 @@ public:
|
|||
void reset();
|
||||
|
||||
Encryption state() const;
|
||||
void setChecked( bool checked );
|
||||
void setText( const QString& text );
|
||||
|
||||
QString passphrase() const;
|
||||
|
|
Loading…
Add table
Reference in a new issue