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

Revert removing check on root with unencrypted boot

Browse Source
This commit is contained in:
abalfoort 2023-05-23 15:07:54 +02:00
parent 5c4557e4d1
commit def9bf18d3
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
View File

@ -321,6 +321,12 @@ LuksBootKeyFileJob::exec()
for ( const auto& d : s.devices ) for ( const auto& d : s.devices )
{ {
// Skip setupLuks for root partition if system has an unencrypted /boot
if ( d.isRoot && hasUnencryptedSeparateBoot() )
{
continue;
}
if ( !setupLuks( d ) ) if ( !setupLuks( d ) )
return Calamares::JobResult::error( return Calamares::JobResult::error(
tr( "Encryption setup error" ), tr( "Encryption setup error" ),