From e50c2bcb44b57a77751326a6f598621ac3055311 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 23 Feb 2019 16:52:10 -0500 Subject: [PATCH] [grubcfg] REVERT d775cee4cfdba4047802c9821c1d80ef69cb81b4 This is causing issue #1073 and needs further thought. --- src/modules/grubcfg/main.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py index d3f292281..b19ebf588 100644 --- a/src/modules/grubcfg/main.py +++ b/src/modules/grubcfg/main.py @@ -62,12 +62,6 @@ def modify_grub_default(partitions, root_mount_point, distributor): cryptdevice_params = [] - # GRUB needs to decrypt the partition that /boot is on, which may be / or /boot - boot_mountpoint = "/" - for partition in partitions: - if partition["mountPoint"] == "/boot": - boot_mountpoint = "/boot" - if have_dracut: for partition in partitions: has_luks = "luksMapperName" in partition @@ -78,7 +72,7 @@ def modify_grub_default(partitions, root_mount_point, distributor): swap_outer_uuid = partition["luksUuid"] swap_outer_mappername = partition["luksMapperName"] - if (partition["mountPoint"] == boot_mountpoint and has_luks): + if (partition["mountPoint"] == "/" and has_luks): cryptdevice_params = [ "rd.luks.uuid={!s}".format(partition["luksUuid"]) ] @@ -88,7 +82,7 @@ def modify_grub_default(partitions, root_mount_point, distributor): if partition["fs"] == "linuxswap" and not has_luks: swap_uuid = partition["uuid"] - if (partition["mountPoint"] == boot_mountpoint and has_luks): + if (partition["mountPoint"] == "/" and has_luks): cryptdevice_params = [ "cryptdevice=UUID={!s}:{!s}".format( partition["luksUuid"], partition["luksMapperName"]