From 77fb264129d9cf97202e5a07aa694d66083aee4f Mon Sep 17 00:00:00 2001
From: Teo Mrnjavac <teo@kde.org>
Date: Fri, 16 Sep 2016 16:30:17 +0200
Subject: [PATCH] Fix VFAT filename handling in bootloader module.
CAL-385 #close
---
src/modules/bootloader/main.py | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py
index e0125ee64e..d292de6fda 100644
--- a/src/modules/bootloader/main.py
+++ b/src/modules/bootloader/main.py
@@ -220,15 +220,14 @@ def install_grub(efi_directory, fw_type):
"--force"])
# VFAT is weird, see issue CAL-385
- efi_directory_firmware = case_insensitive_subdir(efi_directory,
- ["EFI", "Efi", "efi"])
- if not efi_directory_firmware:
- efi_directory_firmware = os.path.join(efi_directory, "EFI")
-
- efi_boot_directory = case_insensitive_subdir(efi_directory_firmware,
- ["Boot", "boot", "BOOT"])
- if not efi_boot_directory:
- efi_boot_directory = os.path.join(efi_directory_firmware, "boot")
+ efi_directory_firmware = os.path.join(efi_directory, "EFI")
+ if os.path.exists(efi_directory_firmware):
+ efi_directory_firmware = vfat_correct_case(efi_directory, "EFI")
+
+ efi_boot_directory = os.path.join(efi_directory_firmware, "boot")
+ if os.path.exists(efi_boot_directory):
+ efi_boot_directory = vfat_correct_case(efi_directory_firmware, "boot")
+ else:
check_target_env_call(["mkdir", "-p", efi_boot_directory])
# Workaround for some UEFI firmwares
@@ -251,11 +250,11 @@ def install_grub(efi_directory, fw_type):
libcalamares.job.configuration["grubCfg"]])
-def case_insensitive_subdir(parent, candidate_dirnames):
- for dirname in candidate_dirnames:
- if os.path.isdir(os.path.join(parent, dirname)):
- return os.path.join(parent, dirname)
- return ""
+def vfat_correct_case(parent, name):
+ for candidate in os.listdir(parent):
+ if name.lower() == candidate.lower():
+ return candidate
+ return os.path.join(parent, name)
def prepare_bootloader(fw_type):
--
GitLab