[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
12/35: image: Add bootloader installation support.
From: |
guix-commits |
Subject: |
12/35: image: Add bootloader installation support. |
Date: |
Thu, 28 May 2020 13:03:30 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit dd10d31d0016ebcdb690e8f180d73dfdb3fb755b
Author: Mathieu Othacehe <othacehe@gnu.org>
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 b37ea93..49faeab 100644
--- a/gnu/build/image.scm
+++ b/gnu/build/image.scm
@@ -155,6 +155,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)
@@ -178,6 +180,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 ffc746f..6608991 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -236,7 +236,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)))))
- 16/35: image: Do not use VM to create disk-images., (continued)
- 16/35: image: Do not use VM to create disk-images., guix-commits, 2020/05/28
- 21/35: system: Add 'hurd' field to <operating-system>., guix-commits, 2020/05/28
- 23/35: system: Add 'multiboot-modules' field to <boot-parameters>., guix-commits, 2020/05/28
- 25/35: system: Use 'hurd' package in label., guix-commits, 2020/05/28
- 26/35: system: examples: Add bare-hurd.tmpl., guix-commits, 2020/05/28
- 29/35: services: hurd: Use activation-service, hurd-etc-service., guix-commits, 2020/05/28
- 31/35: services: Add `hurd-console-service-type'., guix-commits, 2020/05/28
- 32/35: services: Add `hurd-getty-service-type'., guix-commits, 2020/05/28
- 04/35: vm: 'qemu-image' preserves the cross-compilation target of the OS., guix-commits, 2020/05/28
- 10/35: bootloader: grub: Do not run grub-install when creating a disk-image., guix-commits, 2020/05/28
- 12/35: image: Add bootloader installation support.,
guix-commits <=
- 19/35: image: Support extra-directives, add hurd-directives., guix-commits, 2020/05/28
- 20/35: system: hurd: Add hurd-default-essential-services., guix-commits, 2020/05/28
- 22/35: bootloader: Extend `<menu-entry>' for multiboot., guix-commits, 2020/05/28
- 27/35: services: hurd: Add `hurd-etc-service'., guix-commits, 2020/05/28
- 11/35: bootloader: grub: Use inheritance to define grub-minimal-bootloader., guix-commits, 2020/05/28
- 24/35: bootloader: grub: Add support for multiboot., guix-commits, 2020/05/28
- 28/35: system: Add `hurd-activation'., guix-commits, 2020/05/28
- 30/35: gnu: hurd: Create minimal "runsystem" script to invoke "rc"., guix-commits, 2020/05/28
- 33/35: system: hurd: Populate services., guix-commits, 2020/05/28
- 34/35: system: hurd: Remove 'cross-hurd-image' hack., guix-commits, 2020/05/28