napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix VFAT filename handling in bootloader module.

Browse Source 
CAL-385 #close
This commit is contained in:
Teo Mrnjavac 2016-09-16 16:30:17 +02:00
parent 0c29233062
commit 77fb264129
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/modules/bootloader/main.py
View File

@ -220,15 +220,14 @@ def install_grub(efi_directory, fw_type):
"--force"]) "--force"])
# VFAT is weird, see issue CAL-385 # 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_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 = 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_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]) check_target_env_call(["mkdir", "-p", efi_boot_directory])
# Workaround for some UEFI firmwares # Workaround for some UEFI firmwares
@ -251,11 +250,11 @@ def install_grub(efi_directory, fw_type):
libcalamares.job.configuration["grubCfg"]]) libcalamares.job.configuration["grubCfg"]])
def case_insensitive_subdir(parent, candidate_dirnames): def vfat_correct_case(parent, name):
for dirname in candidate_dirnames: for candidate in os.listdir(parent):
if os.path.isdir(os.path.join(parent, dirname)): if name.lower() == candidate.lower():
return os.path.join(parent, dirname) return candidate
return "" return os.path.join(parent, name)
def prepare_bootloader(fw_type): def prepare_bootloader(fw_type):