From def9bf18d38a850267a7aa028731bbbb691b128b Mon Sep 17 00:00:00 2001 From: abalfoort Date: Tue, 23 May 2023 15:07:54 +0200 Subject: [PATCH] Revert removing check on root with unencrypted boot --- src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp index 457c0f4dc..482ae5dcc 100644 --- a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp +++ b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp @@ -321,6 +321,12 @@ LuksBootKeyFileJob::exec() 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 ) ) return Calamares::JobResult::error( tr( "Encryption setup error" ),