Merge pull request #217 from codeworkx/master

Fixes for grub efi
This commit is contained in:
Teo Mrnjavac 2015-05-01 11:14:04 +02:00
commit e4fde03f77
2 changed files with 5 additions and 5 deletions

View File

@ -180,7 +180,8 @@ def install_grub(efi_directory, fw_type):
check_chroot_call( check_chroot_call(
[libcalamares.job.configuration["grubInstall"], "--target=x86_64-efi", [libcalamares.job.configuration["grubInstall"], "--target=x86_64-efi",
"--efi-directory={!s}".format(efi_directory), "--efi-directory={!s}".format(efi_directory),
"--bootloader-id={!s}".format(efi_bootloader_id)]) "--bootloader-id={!s}".format(efi_bootloader_id),
"--force"])
# Workaround for some UEFI firmwares # Workaround for some UEFI firmwares
check_chroot_call(["mkdir", "-p", "{!s}/boot".format(efi_directory_firmware)]) check_chroot_call(["mkdir", "-p", "{!s}/boot".format(efi_directory_firmware)])
check_chroot_call(["cp", "{!s}/{!s}/grubx64.efi".format(efi_directory_firmware, check_chroot_call(["cp", "{!s}/{!s}/grubx64.efi".format(efi_directory_firmware,

View File

@ -14,7 +14,6 @@ extraMounts:
mountPoint: /run mountPoint: /run
extraMountsEfi: extraMountsEfi:
- device: /sys/firmware/efi - device: efivarfs
mountPoint: /sys/firmware/efi fs: efivarfs
options: bind mountPoint: /sys/firmware/efi/efivars