From c4405eafa3a8732b6d271d81f152bda22e4837c2 Mon Sep 17 00:00:00 2001 From: Philip Date: Tue, 12 Sep 2017 05:03:04 -0400 Subject: [PATCH] [grubcfg] work on #797 and #796 --- src/modules/grubcfg/main.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py index 3ef68e46e..08b435cb0 100644 --- a/src/modules/grubcfg/main.py +++ b/src/modules/grubcfg/main.py @@ -3,7 +3,7 @@ # # === This file is part of Calamares - === # -# Copyright 2014-2015, Philip Müller +# Copyright 2014-2017, Philip Müller # Copyright 2015-2017, Teo Mrnjavac # Copyright 2017, Alf Gaida # Copyright 2017, Adriaan de Groot @@ -60,10 +60,10 @@ def modify_grub_default(partitions, root_mount_point, distributor): if have_dracut: for partition in partitions: has_luks = "luksMapperName" in partition - if partition["fs"] == "linuxswap" and not has_luks: + if partition["fs"].lower() == "linuxswap" and not has_luks: swap_uuid = partition["uuid"] - if (partition["fs"] == "linuxswap" and has_luks): + if (partition["fs"].lower() == "linuxswap" and has_luks): swap_outer_uuid = partition["luksUuid"] swap_outer_mappername = partition["luksMapperName"] @@ -74,7 +74,7 @@ def modify_grub_default(partitions, root_mount_point, distributor): else: for partition in partitions: has_luks = "luksMapperName" in partition - if partition["fs"] == "linuxswap" and not has_luks: + if partition["fs"].lower() == "linuxswap" and not has_luks: swap_uuid = partition["uuid"] if (partition["mountPoint"] == "/" and has_luks):