applications/calamares
3
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-02-24 19:05:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[grubcfg] Use own swap

Browse source 
- In situations where there are more swap partitions, only use
  partitions this install "owns".
This commit is contained in:
Adriaan de Groot 2020-02-20 16:59:05 +01:00
parent 5247c13f98
commit 50161cdab9
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/modules/grubcfg/main.py
View file

@ -80,6 +80,9 @@ def modify_grub_default(partitions, root_mount_point, distributor):
if have_dracut: if have_dracut:
for partition in partitions: for partition in partitions:
if partition["fs"] == "linuxswap" and not partition.get("claimed", None):
# Skip foreign swap
continue
has_luks = "luksMapperName" in partition has_luks = "luksMapperName" in partition
if partition["fs"] == "linuxswap" and not has_luks: if partition["fs"] == "linuxswap" and not has_luks:
swap_uuid = partition["uuid"] swap_uuid = partition["uuid"]
@ -94,6 +97,9 @@ def modify_grub_default(partitions, root_mount_point, distributor):
] ]
else: else:
for partition in partitions: for partition in partitions:
if partition["fs"] == "linuxswap" and not partition.get("claimed", None):
# Skip foreign swap
continue
has_luks = "luksMapperName" in partition has_luks = "luksMapperName" in partition
if partition["fs"] == "linuxswap" and not has_luks: if partition["fs"] == "linuxswap" and not has_luks:
swap_uuid = partition["uuid"] swap_uuid = partition["uuid"]