[bootloader] Simplify finding the ESP

6 years ago · 333f0d9215
parent df37c51c1e
commit 333f0d9215
1 changed files with 2 additions and 8 deletions
--- 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