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

Merge branch 'master' of https://github.com/calamares/calamares into development

Browse Source
This commit is contained in:
Philip Müller 2019-02-24 10:54:03 +01:00
commit 3f70007410
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,12 +62,6 @@ 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
@ -78,7 +72,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"] == boot_mountpoint and has_luks): if (partition["mountPoint"] == "/" and has_luks):
cryptdevice_params = [ cryptdevice_params = [
"rd.luks.uuid={!s}".format(partition["luksUuid"]) "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: if partition["fs"] == "linuxswap" and not has_luks:
swap_uuid = partition["uuid"] swap_uuid = partition["uuid"]
if (partition["mountPoint"] == boot_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"]