From 3bf57c7785a5efd6c43d50b97212c6a995598953 Mon Sep 17 00:00:00 2001 From: Chrysostomus Date: Tue, 3 Nov 2020 13:55:24 +0200 Subject: [PATCH] Use graphical decryption prompt with plymouth as adviced here: https://wiki.archlinux.org/index.php/plymouth#The_plymouth_hook --- src/modules/initcpiocfg/main.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/modules/initcpiocfg/main.py b/src/modules/initcpiocfg/main.py index aef980e25..6e86b3908 100644 --- a/src/modules/initcpiocfg/main.py +++ b/src/modules/initcpiocfg/main.py @@ -123,10 +123,6 @@ def modify_mkinitcpio_conf(partitions, root_mount_point): openswap_hook = False unencrypted_separate_boot = False - # It is important that the plymouth hook comes before any encrypt hook - if detect_plymouth(): - hooks.append("plymouth") - for partition in partitions: if partition["fs"] == "linuxswap" and not partition.get("claimed", None): # Skip foreign swap @@ -154,7 +150,10 @@ def modify_mkinitcpio_conf(partitions, root_mount_point): hooks.append("usr") if encrypt_hook: - hooks.append("encrypt") + if detect_plymouth(): + hooks.append("plymouth-encrypt") + else: + hooks.append("encrypt") if not unencrypted_separate_boot and \ os.path.isfile( os.path.join(root_mount_point, "crypto_keyfile.bin")