aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Othacehe <m.othacehe@gmail.com>2017-04-15 16:19:06 +0200
committerDanny Milosavljevic <dannym@scratchpost.org>2017-04-15 16:37:55 +0200
commit2e58e05bb68d4b747882cfa2b460b132d456f54a (patch)
tree5cd534511dacc6dc49be6962f1b3c862d72891d6
parent0ab1e8ae8892c92fd7a1fd07430ba6f2b710668d (diff)
downloadguix-2e58e05bb68d4b747882cfa2b460b132d456f54a.tar
guix-2e58e05bb68d4b747882cfa2b460b132d456f54a.tar.gz
system: Pass boot-parameters to (gnu system grub).
* gnu/system.scm (operating-system-bootcfg): Pass boot-parameters. * gnu/system/grub.scm (boot-parameters->menu-entry): New variable. (grub-configuration-file): Use boot-parameters->menu-entry. Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
-rw-r--r--gnu/system.scm11
-rw-r--r--gnu/system/grub.scm15
2 files changed, 19 insertions, 7 deletions
diff --git a/gnu/system.scm b/gnu/system.scm
index 69cbc8a081..4721668ba3 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -742,16 +742,17 @@ populate the \"old entries\" menu."
(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 (fs->boot-device store-fs))
- (device-mount-point
+ (store-device (fs->boot-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 bcfc3beae6..f2838d633d 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)
@@ -266,6 +267,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))
@@ -275,7 +285,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
@@ -321,7 +332,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 "}~%"))
#~()))))