From f156fc356248f6ea4eec8b48afe2152c827748ed Mon Sep 17 00:00:00 2001 From: dalto Date: Tue, 21 Feb 2023 17:24:01 -0600 Subject: [PATCH] [partition] Enable encryption for zfs with replace partition --- src/modules/partition/gui/ChoicePage.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index 222f686a0..171df4a57 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -1747,15 +1747,7 @@ ChoicePage::createBootloaderPanel() bool ChoicePage::shouldShowEncryptWidget( Config::InstallChoice choice ) const { - // If there are any choices for FS, check it's not ZFS because that doesn't - // support the kind of encryption we enable here. - bool suitableFS = true; - if ( m_replaceFsTypesChoiceComboBox && m_replaceFsTypesChoiceComboBox->isVisible() - && m_replaceFsTypesChoiceComboBox->currentText() == "zfs" ) - { - suitableFS = false; - } const bool suitableChoice = choice == InstallChoice::Erase || choice == InstallChoice::Alongside || choice == InstallChoice::Replace; - return suitableChoice && m_enableEncryptionWidget && suitableFS; + return suitableChoice && m_enableEncryptionWidget; }