[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#31959] [PATCH] bootloader: grub-efi: Support EFI directories relati
From: |
Marius Bakke |
Subject: |
[bug#31959] [PATCH] bootloader: grub-efi: Support EFI directories relative to MOUNT-POINT. |
Date: |
Sun, 24 Jun 2018 22:11:41 +0200 |
* gnu/bootloader/grub.scm (install-grub-efi): When MOUNT-POINT/EFI-DIR exists,
install there rather than EFI-DIR directly.
---
gnu/bootloader/grub.scm | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm
index a131f3b50..8371888fa 100644
--- a/gnu/bootloader/grub.scm
+++ b/gnu/bootloader/grub.scm
@@ -387,12 +387,17 @@ submenu \"GNU system, old configurations...\" {~%")
;; 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")))
+ (install-dir (string-append mount-point "/boot"))
+ ;; When installing GuixSD, 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")
(unless (zero? (system* grub-install "--boot-directory" install-dir
- "--efi-directory" efi-dir))
+ "--efi-directory" target-esp))
(error "failed to install GRUB (EFI)")))))
--
2.18.0
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [bug#31959] [PATCH] bootloader: grub-efi: Support EFI directories relative to MOUNT-POINT.,
Marius Bakke <=