From 2145fc40d3eb949885ce94883b09c7291c607be6 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 7 Nov 2020 10:03:53 +0100 Subject: [PATCH] bootloader: grub: Fix EFI installation. When producing a disk-image, "install-grub-efi" will be called with EFI-DIR set to false. The EFI bootloader is already installed by "initialize-efi-partition". In that case, do not proceed to bootloader installation. Fixes: . * gnu/bootloader/grub.scm (install-grub-efi): Do not install the bootloader if EFI-DIR is false. --- gnu/bootloader/grub.scm | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 0899fab61f..3404456df9 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -574,20 +574,24 @@ fi~%")))) (define install-grub-efi #~(lambda (bootloader efi-dir mount-point) ;; Install GRUB onto the EFI partition mounted at EFI-DIR, for the - ;; system whose root is mounted at MOUNT-POINT. - (let ((grub-install (string-append bootloader "/sbin/grub-install")) - (install-dir (string-append mount-point "/boot")) - ;; When installing Guix, it's common to mount EFI-DIR below - ;; MOUNT-POINT rather than /boot/efi on the live image. - (target-esp (if (file-exists? (string-append mount-point efi-dir)) - (string-append mount-point efi-dir) - efi-dir))) - ;; Tell 'grub-install' that there might be a LUKS-encrypted /boot or - ;; root partition. - (setenv "GRUB_ENABLE_CRYPTODISK" "y") - (invoke/quiet grub-install "--boot-directory" install-dir - "--bootloader-id=Guix" - "--efi-directory" target-esp)))) + ;; system whose root is mounted at MOUNT-POINT. When producing a + ;; disk-image, EFI-DIR is false and the EFI bootloader is already + ;; installed using "initialize-efi-partition". + (when efi-dir + (let ((grub-install (string-append bootloader "/sbin/grub-install")) + (install-dir (string-append mount-point "/boot")) + ;; When installing Guix, it's common to mount EFI-DIR below + ;; MOUNT-POINT rather than /boot/efi on the live image. + (target-esp (if (file-exists? + (string-append mount-point efi-dir)) + (string-append mount-point efi-dir) + efi-dir))) + ;; Tell 'grub-install' that there might be a LUKS-encrypted /boot or + ;; root partition. + (setenv "GRUB_ENABLE_CRYPTODISK" "y") + (invoke/quiet grub-install "--boot-directory" install-dir + "--bootloader-id=Guix" + "--efi-directory" target-esp))))) (define (install-grub-efi-netboot subdir) "Define a grub-efi-netboot bootloader installer for installation in SUBDIR, -- 2.29.2