napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use graphical decryption prompt with plymouth as adviced here: https://wiki.archlinux.org/index.php/plymouth#The_plymouth_hook

Browse Source
This commit is contained in:
Chrysostomus 2020-11-03 13:55:24 +02:00
parent ed95c4a541
commit 3bf57c7785
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/initcpiocfg/main.py
View File

@ -123,10 +123,6 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
openswap_hook = False openswap_hook = False
unencrypted_separate_boot = 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: for partition in partitions:
if partition["fs"] == "linuxswap" and not partition.get("claimed", None): if partition["fs"] == "linuxswap" and not partition.get("claimed", None):
# Skip foreign swap # Skip foreign swap
@ -154,7 +150,10 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
hooks.append("usr") hooks.append("usr")
if encrypt_hook: if encrypt_hook:
hooks.append("encrypt") if detect_plymouth():
hooks.append("plymouth-encrypt")
else:
hooks.append("encrypt")
if not unencrypted_separate_boot and \ if not unencrypted_separate_boot and \
os.path.isfile( os.path.isfile(
os.path.join(root_mount_point, "crypto_keyfile.bin") os.path.join(root_mount_point, "crypto_keyfile.bin")