janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 8fec05e830092f3d20180da5929c43dfa8c29c94
Author: Jan (janneke) Nieuwenhuizen <[email protected]>
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 9319958..6178a3b 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-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 '())
