From 0ed0d37693df03785e86bb8e500b327bc88d6724 Mon Sep 17 00:00:00 2001
From: Chrysostomus <matti@manjaro.org>
Date: Sat, 5 Dec 2020 22:55:35 +0200
Subject: [PATCH] Don't use plymouth-encrypt if there is keyfile in use,
 because it is buggy and asks for password even when it is not needed

---
 src/modules/initcpiocfg/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/initcpiocfg/main.py b/src/modules/initcpiocfg/main.py
index 0ccffbf56..2b999f46c 100644
--- a/src/modules/initcpiocfg/main.py
+++ b/src/modules/initcpiocfg/main.py
@@ -153,7 +153,7 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
             hooks.append("usr")
 
     if encrypt_hook:
-        if detect_plymouth():
+        if detect_plymouth() and unencrypted_separate_boot():
             hooks.append("plymouth-encrypt")
         else:
             hooks.append("encrypt")