From 50161cdab9080e398b636648909a2cae90324932 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 20 Feb 2020 16:59:05 +0100 Subject: [PATCH] [grubcfg] Use own swap - In situations where there are more swap partitions, only use partitions this install "owns". --- src/modules/grubcfg/main.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py index 5d9428eeb..0df255e75 100644 --- a/src/modules/grubcfg/main.py +++ b/src/modules/grubcfg/main.py @@ -80,6 +80,9 @@ def modify_grub_default(partitions, root_mount_point, distributor): if have_dracut: for partition in partitions: + if partition["fs"] == "linuxswap" and not partition.get("claimed", None): + # Skip foreign swap + continue has_luks = "luksMapperName" in partition if partition["fs"] == "linuxswap" and not has_luks: swap_uuid = partition["uuid"] @@ -94,6 +97,9 @@ def modify_grub_default(partitions, root_mount_point, distributor): ] else: for partition in partitions: + if partition["fs"] == "linuxswap" and not partition.get("claimed", None): + # Skip foreign swap + continue has_luks = "luksMapperName" in partition if partition["fs"] == "linuxswap" and not has_luks: swap_uuid = partition["uuid"]