janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 51308c6487733142a01bedd9462bf45887119cd6
Author: Jan (janneke) Nieuwenhuizen <[email protected]>
AuthorDate: Sat May 30 09:23:06 2020 +0200
squash! bootloader: Extend `<menu-entry>' for multiboot.
---
gnu/bootloader.scm | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/gnu/bootloader.scm b/gnu/bootloader.scm
index c62aca9..d0bcab1 100644
--- a/gnu/bootloader.scm
+++ b/gnu/bootloader.scm
@@ -36,6 +36,7 @@
menu-entry-initrd
menu-entry-device-mount-point
menu-entry-multiboot-kernel
+ menu-entry-multiboot-arguments
menu-entry-multiboot-modules
menu-entry->sexp
@@ -89,6 +90,8 @@
(default #f))
(multiboot-kernel menu-entry-multiboot-kernel
(default #f))
+ (multiboot-arguments menu-entry-multiboot-arguments
+ (default '())) ; list of string-valued gexps
(multiboot-modules menu-entry-multiboot-modules
(default '()))) ; list of multiboot commands, where
; a command is a list of <string>
@@ -106,12 +109,13 @@
(linux-arguments ,linux-arguments)
(initrd ,initrd)))
(($ <menu-entry> label device mount-point #f () #f
- multiboot-kernel multiboot-modules)
+ multiboot-kernel multiboot-arguments multiboot-modules)
`(menu-entry (version 0)
(label ,label)
(device ,device)
(device-mount-point ,mount-point)
(multiboot-kernel ,multiboot-kernel)
+ (multiboot-arguments ,multiboot-arguments)
(multiboot-modules ,multiboot-modules)))))
(define (sexp->menu-entry sexp)
@@ -134,12 +138,14 @@ record."
('label label) ('device device)
('device-mount-point mount-point)
('multiboot-kernel multiboot-kernel)
+ ('multiboot-arguments multiboot-arguments)
('multiboot-modules multiboot-modules) _ ...)
(menu-entry
(label label)
(device device)
(device-mount-point mount-point)
(multiboot-kernel multiboot-kernel)
+ (multiboot-arguments multiboot-arguments)
(multiboot-modules multiboot-modules)))))
