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

Merge pull request #1948 from dalto8/zfsencryption

Browse Source 
[partition] Don't offer whole disk encryption when zfs is selected
This commit is contained in:
Adriaan de Groot 2022-05-17 10:31:48 +02:00 committed by GitHub
commit a63c474d93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 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