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

Merge pull request #1565 from Chrysostomus/calamares

Browse Source 
[initcpiocfg] Use graphical decryption prompt with plymouth
This commit is contained in:
Adriaan de Groot 2020-11-03 14:29:22 +01:00 committed by GitHub
commit 72c9df67d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -154,6 +154,9 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
hooks.append("usr") hooks.append("usr")
if encrypt_hook: if encrypt_hook:
if detect_plymouth():
hooks.append("plymouth-encrypt")
else:
hooks.append("encrypt") hooks.append("encrypt")
if not unencrypted_separate_boot and \ if not unencrypted_separate_boot and \
os.path.isfile( os.path.isfile(