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

Merge pull request #2087 from dalto8/encrypt-options

Browse Source 
[partition] Restore encryption option to alongside and replace options
This commit is contained in:
dalto8 2023-02-17 21:08:55 +00:00 committed by GitHub
commit 35cc54a6b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -1743,5 +1743,7 @@ ChoicePage::shouldShowEncryptWidget( Config::InstallChoice choice ) const
// If there are any choices for FS, check it's not ZFS because that doesn't // If there are any choices for FS, check it's not ZFS because that doesn't
// support the kind of encryption we enable here. // support the kind of encryption we enable here.
const bool suitableFS = m_eraseFsTypesChoiceComboBox ? m_eraseFsTypesChoiceComboBox->currentText() != "zfs" : true; 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;
} }