From 741c1c5d1e00ecb30b1d17ec4dff7d6c027d7957 Mon Sep 17 00:00:00 2001 From: Chrysostomus Date: Thu, 5 Nov 2020 01:01:26 +0200 Subject: [PATCH] Use constructor instead of a loop --- src/modules/grubcfg/main.py | 7 ++----- src/modules/openrcdmcryptcfg/main.py | 6 ++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py index 4fd0f7b6b..642e18df2 100644 --- a/src/modules/grubcfg/main.py +++ b/src/modules/grubcfg/main.py @@ -91,11 +91,8 @@ def modify_grub_default(partitions, root_mount_point, distributor): swap_outer_mappername = None no_save_default = False unencrypted_separate_boot = False - - for partition in partitions: - if (partition["mountPoint"] == "/boot" - and "luksMapperName" not in partition): - unencrypted_separate_boot = True + if any(partition["mountPoint"] == "/boot" and "luksMapperName" not in partition for partition in partitions): + unencrypted_separate_boot = True for partition in partitions: if partition["mountPoint"] in ("/", "/boot") and partition["fs"] in ("btrfs", "f2fs"): diff --git a/src/modules/openrcdmcryptcfg/main.py b/src/modules/openrcdmcryptcfg/main.py index 2aa61b1c7..097c1bfd5 100644 --- a/src/modules/openrcdmcryptcfg/main.py +++ b/src/modules/openrcdmcryptcfg/main.py @@ -21,10 +21,6 @@ _ = gettext.translation("calamares-python", fallback=True).gettext -for partition in partitions: - if (partition["mountPoint"] == "/boot" - and "luksMapperName" not in partition): - unencrypted_separate_boot = True def pretty_name(): return _("Configuring OpenRC dmcrypt service.") @@ -34,6 +30,8 @@ def write_dmcrypt_conf(partitions, root_mount_point, dmcrypt_conf_path): crypto_target = "" crypto_source = "" unencrypted_separate_boot = False + if any(partition["mountPoint"] == "/boot" and "luksMapperName" not in partition for partition in partitions): + unencrypted_separate_boot = True for partition in partitions: has_luks = "luksMapperName" in partition