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

[initcpiocfg] Fix encryption hook not being added with encrypted /boot

Browse Source
This commit is contained in:
dalto 2023-08-26 09:55:45 -05:00
parent a9547af8e2
commit d12e40bc34
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,16 +224,12 @@ def find_initcpio_features(partitions, root_mount_point):
hooks.append("usr") hooks.append("usr")
if encrypt_hook: if encrypt_hook:
if unencrypted_separate_boot: if uses_systemd:
if uses_systemd: hooks.append("sd-encrypt")
hooks.append("sd-encrypt") else:
else: hooks.append("encrypt")
hooks.append("encrypt")
crypto_file = "crypto_keyfile.bin" crypto_file = "crypto_keyfile.bin"
if not unencrypted_separate_boot and \ if not unencrypted_separate_boot and os.path.isfile(os.path.join(root_mount_point, crypto_file)):
os.path.isfile(
os.path.join(root_mount_point, crypto_file)
):
files.append(f"/{crypto_file}") files.append(f"/{crypto_file}")
if uses_lvm2: if uses_lvm2: