From cc792d03a650cc6365f26a1a91c312c3861a2632 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Tue, 3 May 2016 17:19:00 +0200 Subject: [PATCH] Add cryptdevice param to kernel line in grubcfg. --- src/modules/grubcfg/main.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py index 5f4e7dcaa..f3e493d53 100644 --- a/src/modules/grubcfg/main.py +++ b/src/modules/grubcfg/main.py @@ -44,12 +44,21 @@ def modify_grub_default(partitions, root_mount_point, distributor): if plymouth_bin == 0: use_splash = "splash" + cryptdevice_params = [] + for partition in partitions: if partition["fs"] == "linuxswap": swap_uuid = partition["uuid"] + if partition["mountPoint"] == "/" and partition["luksMapperName"]: + cryptdevice_params = ["cryptdevice=UUID={!s}:{!s}".format(partition["uuid"], partition["luksMapperName"])] + cryptdevice_params.append("root=/dev/mapper/{!s}".format(partition["luksMapperName"])) + kernel_params = ["quiet"] + if cryptdevice_params: + kernel_params.extend(cryptdevice_params) + if use_splash: kernel_params.append(use_splash)