* [bug#31959] [PATCH] bootloader: grub-efi: Support EFI directories relative to MOUNT-POINT.
@ 2018-06-24 20:11 Marius Bakke
2020-04-07 13:36 ` bug#31959: " Marius Bakke
0 siblings, 1 reply; 2+ messages in thread
From: Marius Bakke @ 2018-06-24 20:11 UTC (permalink / raw)
To: 31959
* 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)")))))
\f
--
2.18.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#31959: [PATCH] bootloader: grub-efi: Support EFI directories relative to MOUNT-POINT.
2018-06-24 20:11 [bug#31959] [PATCH] bootloader: grub-efi: Support EFI directories relative to MOUNT-POINT Marius Bakke
@ 2020-04-07 13:36 ` Marius Bakke
0 siblings, 0 replies; 2+ messages in thread
From: Marius Bakke @ 2020-04-07 13:36 UTC (permalink / raw)
To: 31959-done
[-- Attachment #1: Type: text/plain, Size: 233 bytes --]
Marius Bakke <mbakke@fastmail.com> writes:
> * gnu/bootloader/grub.scm (install-grub-efi): When MOUNT-POINT/EFI-DIR exists,
> install there rather than EFI-DIR directly.
Pushed way back in aa5a549c65485ff826267a48795c1564af17f1c9.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-04-07 13:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-24 20:11 [bug#31959] [PATCH] bootloader: grub-efi: Support EFI directories relative to MOUNT-POINT Marius Bakke
2020-04-07 13:36 ` bug#31959: " Marius Bakke
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).