Revert removing check on root with unencrypted boot

2023-05-23 15:07:54 +02:00 · 2023-05-23 15:07:54 +02:00 · def9bf18d3
commit def9bf18d3
parent 5c4557e4d1
1 changed files with 6 additions and 0 deletions
--- 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" ),