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

grubcfg: Only try to decrypt disk that /boot is on

Browse Source
This commit is contained in:
Matthias Klumpp 2018-08-25 00:26:21 +02:00
parent e7947bd538
commit d775cee4cf
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,6 +62,12 @@ def modify_grub_default(partitions, root_mount_point, distributor):
cryptdevice_params = [] 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: if have_dracut:
for partition in partitions: for partition in partitions:
has_luks = "luksMapperName" in partition has_luks = "luksMapperName" in partition
@ -72,7 +78,7 @@ def modify_grub_default(partitions, root_mount_point, distributor):
swap_outer_uuid = partition["luksUuid"] swap_outer_uuid = partition["luksUuid"]
swap_outer_mappername = partition["luksMapperName"] swap_outer_mappername = partition["luksMapperName"]
if (partition["mountPoint"] == "/" and has_luks): if (partition["mountPoint"] == boot_mountpoint and has_luks):
cryptdevice_params = [ cryptdevice_params = [
"rd.luks.uuid={!s}".format(partition["luksUuid"]) "rd.luks.uuid={!s}".format(partition["luksUuid"])
] ]
@ -82,7 +88,7 @@ def modify_grub_default(partitions, root_mount_point, distributor):
if partition["fs"] == "linuxswap" and not has_luks: if partition["fs"] == "linuxswap" and not has_luks:
swap_uuid = partition["uuid"] swap_uuid = partition["uuid"]
if (partition["mountPoint"] == "/" and has_luks): if (partition["mountPoint"] == boot_mountpoint and has_luks):
cryptdevice_params = [ cryptdevice_params = [
"cryptdevice=UUID={!s}:{!s}".format( "cryptdevice=UUID={!s}:{!s}".format(
partition["luksUuid"], partition["luksMapperName"] partition["luksUuid"], partition["luksMapperName"]