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

[partition] Restore encryption option to alongside and replace partition options

Browse Source
This commit is contained in:
dalto 2023-01-22 10:40:58 -06:00
parent 8f72d2541f
commit 871651c0c1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1741,5 +1741,7 @@ 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.
const bool suitableFS = m_eraseFsTypesChoiceComboBox ? m_eraseFsTypesChoiceComboBox->currentText() != "zfs" : true;
return ( choice == InstallChoice::Erase ) && m_enableEncryptionWidget && suitableFS;
const bool suitableChoice
= choice == InstallChoice::Erase || choice == InstallChoice::Alongside || choice == InstallChoice::Replace;
return suitableChoice && m_enableEncryptionWidget && suitableFS;
}