From f0fb39edd873c95ba7ed0aee60f01af7e805b932 Mon Sep 17 00:00:00 2001
From: Brian Morison <777373+bkmo@users.noreply.github.com>
Date: Sun, 20 Aug 2023 13:07:58 -0600
Subject: [PATCH] Update LuksBootKeyFileJob.cpp

---
 src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
index c9c0e1298..247237898 100644
--- a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
+++ b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
@@ -302,6 +302,14 @@ LuksBootKeyFileJob::exec()
         return Calamares::JobResult::ok();
     }
 
+        if ( hasUnencryptedSeparateBoot() && hasEncryptedRoot() )
+    {
+        // /boot partition is not encrypted, keyfile must not be used
+        // But only if root partition is encrypted
+        cDebug() << Logger::SubEntry << "/boot partition is not encrypted, skipping keyfile creation.";
+        return Calamares::JobResult::ok();
+    }
+
     if ( s.devices.first().passphrase.isEmpty() )
     {
         cDebug() << Logger::SubEntry << "No root passphrase.";