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

[partition] Enable encryption for zfs with replace partition

Browse Source
This commit is contained in:
dalto 2023-02-21 17:24:01 -06:00
parent cea2b1e8d8
commit f156fc3562
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1747,15 +1747,7 @@ ChoicePage::createBootloaderPanel()
bool bool
ChoicePage::shouldShowEncryptWidget( Config::InstallChoice choice ) const 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 const bool suitableChoice
= choice == InstallChoice::Erase || choice == InstallChoice::Alongside || choice == InstallChoice::Replace; = choice == InstallChoice::Erase || choice == InstallChoice::Alongside || choice == InstallChoice::Replace;
return suitableChoice && m_enableEncryptionWidget && suitableFS; return suitableChoice && m_enableEncryptionWidget;
} }