* gnu/system.scm (operating-system-grub.cfg): Pass <boot-parameters>.
* gnu/system/grub.scm (boot-parameters->menu-entry): New variable.
(grub-configuration-file): Use boot-parameters->menu-entry.
---
gnu/system.scm | 12 +++++++-----
gnu/system/grub.scm | 19 +++++++++++++++----
2 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/gnu/system.scm b/gnu/system.scm
index 1006c842c..adbbe37b5 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -97,6 +97,7 @@
operating-system-locale-directory
operating-system-boot-script
+ <boot-parameters>
boot-parameters
boot-parameters?
boot-parameters-label
@@ -738,16 +739,17 @@ listed in OS. The C library expects to find it under
(root-device -> (if (eq? 'uuid (file-system-title root-fs))
(uuid->string (file-system-device root-fs))
(file-system-device root-fs)))
- (entries -> (list (menu-entry
+ (entries -> (list (boot-parameters
(label label)
+ (root-device root-device)
;; The device where the kernel and initrd live.
- (device (grub-device store-fs))
- (device-mount-point
+ (store-device (grub-device store-fs))
+ (store-mount-point
(file-system-mount-point store-fs))
- (linux kernel)
- (linux-arguments
+ (kernel kernel)
+ (kernel-arguments
(cons* (string-append "--root=" root-device)
#~(string-append "--system=" #$system)
#~(string-append "--load=" #$system
diff --git a/gnu/system/grub.scm b/gnu/system/grub.scm
index b18b8be6d..6bb12b801 100644
--- a/gnu/system/grub.scm
+++ b/gnu/system/grub.scm
@@ -26,6 +26,7 @@
#:use-module (guix gexp)
#:use-module (guix download)
#:use-module (gnu artwork)
+ #:use-module (gnu system)
#:use-module (gnu system file-systems)
#:autoload (gnu packages bootloaders) (grub)
#:autoload (gnu packages compression) (gzip)
@@ -264,6 +265,15 @@ code."
(#f
#~(format #f "search --file --set ~a" #$file)))))
+(define (boot-parameters->menu-entry conf)
+ (menu-entry
+ (label (boot-parameters-label conf))
+ (device (boot-parameters-store-device conf))
+ (device-mount-point (boot-parameters-store-mount-point conf))
+ (linux (boot-parameters-kernel conf))
+ (linux-arguments (boot-parameters-kernel-arguments conf))
+ (initrd (boot-parameters-initrd conf))))
+
(define* (grub-configuration-file config entries
#:key
(system (%current-system))
@@ -273,7 +283,8 @@ code."
<file-system> object. OLD-ENTRIES is taken to be a list of menu entries
corresponding to old generations of the system."
(define all-entries
- (append entries (grub-configuration-menu-entries config)))
+ (append (map boot-parameters->menu-entry entries)
+ (grub-configuration-menu-entries config)))
(define entry->gexp
(match-lambda
@@ -296,9 +307,9 @@ corresponding to old generations of the system."
#$initrd)))))
(mlet %store-monad ((sugar (eye-candy config
- (menu-entry-device (first entries))
+ (menu-entry-device (first all-entries))
(menu-entry-device-mount-point
- (first entries))
+ (first all-entries))
#:system system
#:port #~port)))
(define builder
@@ -319,7 +330,7 @@ set timeout=~a~%"
#$@(if (pair? old-entries)
#~((format port "
submenu \"GNU system, old configurations...\" {~%")
- #$@(map entry->gexp old-entries)
+ #$@(map entry->gexp (map boot-parameters->menu-entry
old-entries))
(format port "}~%"))
#~()))))
--
2.11.1
