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

[bootloader] Fix UEFI firmware workaround for 32-bit UEFI.

Browse Source 
On 32-bit UEFI (note that the bitness of the firmware is what matters
here, not the bitness of the distribution), instead of copying
grubx64.efi to bootx64.efi, copy grubia32.efi to bootia32.efi.

Patch by TeHMoroS from SparkyLinux.

CAL-403 #close
This commit is contained in:
Kevin Kofler 2016-11-06 03:38:34 +01:00
parent 003dcac96c
commit 4f11faea52
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -231,9 +231,13 @@ def install_grub(efi_directory, fw_type):
check_target_env_call(["mkdir", "-p", efi_boot_directory])
# Workaround for some UEFI firmwares
efi_file_source = {"32": os.path.join(efi_directory_firmware, efi_bootloader_id, "grubia32.efi"),
"64": os.path.join(efi_directory_firmware, efi_bootloader_id, "grubx64.efi")}
efi_file_target = {"32": os.path.join(efi_boot_directory, "bootia32.efi"),
"64": os.path.join(efi_boot_directory, "bootx64.efi")}
check_target_env_call(["cp",
os.path.join(efi_directory_firmware, efi_bootloader_id, "grubx64.efi"),
os.path.join(efi_boot_directory, "bootx64.efi")])
efi_file_source[efi_bitness],
efi_file_target[efi_bitness]])
else:
print("Bootloader: grub (bios)")
boot_loader = libcalamares.globalstorage.value("bootLoader")