[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/09: image: Use grub-efi to install the EFI bootloader.
From: |
guix-commits |
Subject: |
06/09: image: Use grub-efi to install the EFI bootloader. |
Date: |
Fri, 29 May 2020 03:12:31 -0400 (EDT) |
mothacehe pushed a commit to branch master
in repository guix.
commit 05f37c16a3b159e58ce7343383b44073bd6cac9f
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Sat May 23 19:10:04 2020 +0200
image: Use grub-efi to install the EFI bootloader.
* gnu/build/image.scm (initialize-efi-partition): Rename bootloader-package
argument to grub-efi.
* gnu/system/image.scm (system-disk-image): Adapt accordingly to pass
grub-efi package.
---
gnu/build/image.scm | 4 ++--
gnu/system/image.scm | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnu/build/image.scm b/gnu/build/image.scm
index 49faeab..a8594e2 100644
--- a/gnu/build/image.scm
+++ b/gnu/build/image.scm
@@ -146,10 +146,10 @@ deduplicates files common to CLOSURE and the rest of
PREFIX."
(define* (initialize-efi-partition root
#:key
- bootloader-package
+ grub-efi
#:allow-other-keys)
"Install in ROOT directory, an EFI loader using BOOTLOADER-PACKAGE."
- (install-efi-loader bootloader-package root))
+ (install-efi-loader grub-efi root))
(define* (initialize-root-partition root
#:key
diff --git a/gnu/system/image.scm b/gnu/system/image.scm
index 67cf5fd..93b95b3 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -234,6 +234,7 @@ used in the image."
#:references-graphs '#$graph
#:deduplicate? #f
#:system-directory #$os
+ #:grub-efi #+grub-efi
#:bootloader-package
#+(bootloader-package bootloader)
#:bootloader-installer
- branch master updated (7c5c21f -> e3f0155), guix-commits, 2020/05/29
- 02/09: bootloader: grub: Do not run grub-install when creating a disk-image., guix-commits, 2020/05/29
- 05/09: system: image: Correct genimage configuration file indentation., guix-commits, 2020/05/29
- 01/09: bootloader: Add 'disk-image-installer'., guix-commits, 2020/05/29
- 03/09: bootloader: grub: Use inheritance to define grub-minimal-bootloader., guix-commits, 2020/05/29
- 04/09: image: Add bootloader installation support., guix-commits, 2020/05/29
- 06/09: image: Use grub-efi to install the EFI bootloader.,
guix-commits <=
- 08/09: image: Add a post-MBR gap to the default image., guix-commits, 2020/05/29
- 09/09: image: Do not use VM to create disk-images., guix-commits, 2020/05/29
- 07/09: system: image: Fix image-with-os., guix-commits, 2020/05/29