[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
26/36: system: hurd: Add hurd-grub-minimal-bootloader.
From: |
guix-commits |
Subject: |
26/36: system: hurd: Add hurd-grub-minimal-bootloader. |
Date: |
Fri, 1 May 2020 11:54:02 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 5801eb1150a17c87df3d5a387059ee6876c368f3
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Sat Apr 25 14:56:05 2020 +0200
system: hurd: Add hurd-grub-minimal-bootloader.
* gnu/system/hurd.scm (hurd-grub-minimal-bootloader): New public variable.
(%hurd-default-operating-system): Use it.
---
gnu/system/hurd.scm | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm
index c454fdf..00f69d3 100644
--- a/gnu/system/hurd.scm
+++ b/gnu/system/hurd.scm
@@ -26,6 +26,7 @@
#:use-module (guix packages)
#:use-module (guix profiles)
#:use-module (guix utils)
+ #:use-module (gnu bootloader)
#:use-module (gnu bootloader grub)
#:use-module (gnu packages admin)
#:use-module (gnu packages base)
@@ -56,6 +57,7 @@
#:use-module (gnu system vm)
#:export (cross-hurd-image
hurd-grub-configuration-file
+ hurd-grub-minimal-bootloader
%base-packages/hurd
%base-services/hurd
%hurd-default-operating-system))
@@ -105,7 +107,6 @@
#:key
(system (%current-target-system))
(old-entries '()))
- (pk "hurd-grub-configuration-file")
(let ((hurd (if (equal? system (%current-system))
hurd
(with-parameters ((%current-target-system system))
@@ -135,10 +136,17 @@ menuentry \"GNU\" {
#+mach #+mach #+hurd
#+libc #+hurd))))))
+(define hurd-grub-minimal-bootloader
+ (bootloader
+ (inherit grub-minimal-bootloader)
+ (configuration-file-generator hurd-grub-configuration-file)))
+
(define %hurd-default-operating-system
(operating-system
(host-name "guixygnu")
- (bootloader #f)
+ (bootloader (bootloader-configuration
+ (bootloader hurd-grub-minimal-bootloader)
+ (target "/dev/vda")))
(kernel hurd)
(initrd-modules '())
(file-systems '())
- 22/36: services: hurd: Move hurd-default-essential-services., (continued)
- 22/36: services: hurd: Move hurd-default-essential-services., guix-commits, 2020/05/01
- 20/36: services: hurd: Move hurd-etc-sevcices., guix-commits, 2020/05/01
- 25/36: system: hurd: Add hurd-grub-configuration-file., guix-commits, 2020/05/01
- 36/36: HACK Don't fail on running host's localedef., guix-commits, 2020/05/01
- 28/36: system: vm: Add defaults for the Hurd., guix-commits, 2020/05/01
- 29/36: gnu: glibc/hurd-headers: Cross-build fix for the Hurd., guix-commits, 2020/05/01
- 34/36: WIP: gnu: services: Add %hurd-bare-metal-service., guix-commits, 2020/05/01
- 32/36: DRAFT system: examples: Add bare-hurd.tmpl., guix-commits, 2020/05/01
- 35/36: HACK system: vm: Add Hurd specifics., guix-commits, 2020/05/01
- 19/36: system: hurd: Add the guix service., guix-commits, 2020/05/01
- 26/36: system: hurd: Add hurd-grub-minimal-bootloader.,
guix-commits <=
- 27/36: system: Add hurd-operating-system-directory-base-entries., guix-commits, 2020/05/01
- 31/36: gnu: hurd: Switch system in RC., guix-commits, 2020/05/01
- 30/36: gnu: hurd: Cross-build hack: Set target i586-pc-gnu if unset., guix-commits, 2020/05/01
- 33/36: DRAFT: gnu: services: Use xprogram-file., guix-commits, 2020/05/01