calamares/calamares-1.0.1-replace_chroot_call.patch
Silvan Calarco 3752836b28 add upstream patch to fix error in chroot_call in EFI installation
require grub and grub-efi-x86_64 [release 1.0.1-7mamba;Sat Mar 07 2015]
2024-01-05 21:03:40 +01:00

14 lines
1.1 KiB
Diff

--- calamares-1.0.1/src/modules/grub/main.py.orig 2015-03-07 13:37:38.315162881 +0100
+++ calamares-1.0.1/src/modules/grub/main.py 2015-03-07 13:39:03.078129593 +0100
@@ -35,8 +35,8 @@
efi_bootloader_id = distribution.translate(file_name_sanitizer)
check_chroot_call([libcalamares.job.configuration["grubInstall"], "--target=x86_64-efi", "--efi-directory={!s}".format(efi_directory), "--bootloader-id={!s}".format(efi_bootloader_id)])
# Workaround for some UEFI firmwares
- chroot_call(["mkdir", "-p", "{!s}/EFI/boot".format(efi_directory)])
- chroot_call(["cp", "{!s}/EFI/{!s}/grubx64.efi".format(efi_directory,efi_bootloader_id), "{!s}/EFI/boot/bootx64.efi".format(efi_directory)])
+ check_chroot_call(["mkdir", "-p", "{!s}/EFI/boot".format(efi_directory)])
+ check_chroot_call(["cp", "{!s}/EFI/{!s}/grubx64.efi".format(efi_directory,efi_bootloader_id), "{!s}/EFI/boot/bootx64.efi".format(efi_directory)])
else:
install_path = boot_loader["installPath"]
check_chroot_call([libcalamares.job.configuration["grubInstall"], "--target=i386-pc", install_path])