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

[grubcfg] With LUKS, resume from the correct swap name

Browse Source 
FIXES #1208
This commit is contained in:
Gabriel Craciunescu 2020-03-18 17:12:33 +01:00 committed by Adriaan de Groot
parent 489fd0b272
commit 65a989d3cd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,15 +110,15 @@ 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["fs"] == "linuxswap" and has_luks):
swap_outer_mappername = partition["luksMapperName"]
if (partition["mountPoint"] == "/" and has_luks): if (partition["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"]
), ),
"root=/dev/mapper/{!s}".format( "root=/dev/mapper/{!s}".format(
partition["luksMapperName"]
),
"resume=/dev/mapper/{!s}".format(
partition["luksMapperName"] partition["luksMapperName"]
) )
] ]
@ -136,7 +136,7 @@ def modify_grub_default(partitions, root_mount_point, distributor):
if have_dracut and swap_outer_uuid: if have_dracut and swap_outer_uuid:
kernel_params.append("rd.luks.uuid={!s}".format(swap_outer_uuid)) kernel_params.append("rd.luks.uuid={!s}".format(swap_outer_uuid))
if have_dracut and swap_outer_mappername: if swap_outer_mappername:
kernel_params.append("resume=/dev/mapper/{!s}".format( kernel_params.append("resume=/dev/mapper/{!s}".format(
swap_outer_mappername)) swap_outer_mappername))