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

[grubcfg] Add rd.luks.key for systemd-encrypt hook

Browse Source
This commit is contained in:
dalto 2023-08-26 11:22:41 -05:00
parent d12e40bc34
commit 3552691e57
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/grubcfg/main.py
View File

@ -137,10 +137,10 @@ def modify_grub_default(partitions, root_mount_point, distributor):
) )
uses_systemd_hook = libcalamares.utils.target_env_call( uses_systemd_hook = libcalamares.utils.target_env_call(
["sh", "-c", "grep -q \"^HOOKS.*systemd\" /etc/mkinitcpio.conf"] ["sh", "-c", "grep -q \"^HOOKS.*systemd\" /etc/mkinitcpio.conf"]
) ) == 0
# Shell exit value 0 means success # Shell exit value 0 means success
have_plymouth = plymouth_bin == 0 have_plymouth = plymouth_bin == 0
use_systemd_naming = dracut_bin == 0 or uses_systemd_hook == 0 use_systemd_naming = dracut_bin == 0 or uses_systemd_hook
use_splash = "" use_splash = ""
swap_uuid = "" swap_uuid = ""
@ -176,6 +176,8 @@ def modify_grub_default(partitions, root_mount_point, distributor):
if partition["mountPoint"] == "/" and has_luks: if partition["mountPoint"] == "/" and has_luks:
cryptdevice_params = [f"rd.luks.uuid={partition['luksUuid']}"] cryptdevice_params = [f"rd.luks.uuid={partition['luksUuid']}"]
if not unencrypted_separate_boot and uses_systemd_hook:
cryptdevice_params.append("rd.luks.key=/crypto_keyfile.bin")
else: else:
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):