[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/10: image: Add bootloader installation support.
From: |
guix-commits |
Subject: |
04/10: image: Add bootloader installation support. |
Date: |
Sat, 23 May 2020 13:37:22 -0400 (EDT) |
mothacehe pushed a commit to branch wip-hurd-vm
in repository guix.
commit 530c220d0ff97fa3266f1238d4ee531202e1ed91
Author: Mathieu Othacehe <address@hidden>
AuthorDate: Sat May 23 19:09:53 2020 +0200
image: Add bootloader installation support.
* gnu/build/image.scm (initialize-root-partition): Add bootloader-package
and
bootloader-installer arguments. Run the bootloader-installer if defined.
* gnu/system/image.scm (system-disk-image): Adapt the partition initializer
call accordingly.
---
gnu/build/image.scm | 5 +++++
gnu/system/image.scm | 4 +++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/gnu/build/image.scm b/gnu/build/image.scm
index 23fc565..2c0933b 100644
--- a/gnu/build/image.scm
+++ b/gnu/build/image.scm
@@ -151,6 +151,8 @@ deduplicates files common to CLOSURE and the rest of
PREFIX."
#:key
bootcfg
bootcfg-location
+ bootloader-package
+ bootloader-installer
(deduplicate? #t)
references-graphs
(register-closures? #t)
@@ -174,6 +176,9 @@ of the directory of the 'system' derivation."
#:deduplicate? deduplicate?))
references-graphs))
+ (when bootloader-installer
+ (display "installing bootloader...\n")
+ (bootloader-installer bootloader-package #f root))
(when bootcfg
(install-boot-config bootcfg bootcfg-location root)))
diff --git a/gnu/system/image.scm b/gnu/system/image.scm
index 70edbae..6267070 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -235,7 +235,9 @@ used in the image."
#:deduplicate? #f
#:system-directory #$os
#:bootloader-package
- #$(bootloader-package bootloader)
+ #+(bootloader-package bootloader)
+ #:bootloader-installer
+ #+(bootloader-installer bootloader)
#:bootcfg #$bootcfg
#:bootcfg-location
#$(bootloader-configuration-file bootloader)))))
- branch wip-hurd-vm updated (cd57c13 -> 7c919d1), guix-commits, 2020/05/23
- 04/10: image: Add bootloader installation support.,
guix-commits <=
- 01/10: bootloader: Add 'disk-image-installer'., guix-commits, 2020/05/23
- 02/10: bootloader: grub: Do not run grub-install when creating a disk-image., guix-commits, 2020/05/23
- 03/10: bootloader: grub: Use inheritance to define grub-minimal-bootloader., guix-commits, 2020/05/23
- 05/10: system: image: Correct genimage configuration file indentation., guix-commits, 2020/05/23
- 09/10: !squash system: Fix initrd field., guix-commits, 2020/05/23
- 06/10: image: Use grub-efi to install the EFI bootloader., guix-commits, 2020/05/23
- 07/10: system: image: Fix image-with-os., guix-commits, 2020/05/23
- 10/10: image: Add Hurd support., guix-commits, 2020/05/23
- 08/10: image: Do not use VM to create disk-images., guix-commits, 2020/05/23