Merge pull request #1594 from Chrysostomus/calamares

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
This commit is contained in:
Adriaan de Groot 2020-12-05 23:04:37 +01:00 committed by GitHub
commit b949967529
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -153,7 +153,7 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
hooks.append("usr") hooks.append("usr")
if encrypt_hook: if encrypt_hook:
if detect_plymouth(): if detect_plymouth() and unencrypted_separate_boot:
hooks.append("plymouth-encrypt") hooks.append("plymouth-encrypt")
else: else:
hooks.append("encrypt") hooks.append("encrypt")