From 8612f427f175dbfdd7f1f6c8eca4401a71b7a986 Mon Sep 17 00:00:00 2001 From: Daniel Hillenbrand Date: Fri, 1 May 2015 10:11:32 +0200 Subject: [PATCH 1/2] bootloader: add --force argument for grub efi --- src/modules/bootloader/main.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py index 0fdd889c3..a91dd0a16 100644 --- a/src/modules/bootloader/main.py +++ b/src/modules/bootloader/main.py @@ -180,7 +180,8 @@ def install_grub(efi_directory, fw_type): check_chroot_call( [libcalamares.job.configuration["grubInstall"], "--target=x86_64-efi", "--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 check_chroot_call(["mkdir", "-p", "{!s}/boot".format(efi_directory_firmware)]) check_chroot_call(["cp", "{!s}/{!s}/grubx64.efi".format(efi_directory_firmware, From e4daf45c71077a4fe66293182c61ffbd5883da8e Mon Sep 17 00:00:00 2001 From: Daniel Hillenbrand Date: Fri, 1 May 2015 10:42:06 +0200 Subject: [PATCH 2/2] mount: mount efivarfs on /sys/firmware/efi/efivars No need to bind sys to /sys/firmware/efi since it is already preset. --- src/modules/mount/mount.conf | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/modules/mount/mount.conf b/src/modules/mount/mount.conf index 5da436754..68e214ed3 100644 --- a/src/modules/mount/mount.conf +++ b/src/modules/mount/mount.conf @@ -14,7 +14,6 @@ extraMounts: mountPoint: /run extraMountsEfi: - - device: /sys/firmware/efi - mountPoint: /sys/firmware/efi - options: bind - + - device: efivarfs + fs: efivarfs + mountPoint: /sys/firmware/efi/efivars