From 333f0d9215b3f92eacbb7f9b20d67e7e728a6737 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 19 Apr 2019 16:43:07 +0200 Subject: [PATCH] [bootloader] Simplify finding the ESP --- src/modules/bootloader/main.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py index 77b030f9d..56eecdb3b 100644 --- a/src/modules/bootloader/main.py +++ b/src/modules/bootloader/main.py @@ -440,15 +440,9 @@ def run(): return None partitions = libcalamares.globalstorage.value("partitions") - if fw_type == "efi": - esp_found = False - - for partition in partitions: - if (partition["mountPoint"] == - libcalamares.globalstorage.value("efiSystemPartition")): - esp_found = True - + efi_system_partition = libcalamares.globalstorage.value("efiSystemPartition") + esp_found = [ p for p in partitions if p["mountPoint"] == efi_system_partition ] if not esp_found: return None