aboutsummaryrefslogtreecommitdiff
path: root/gnu/system.scm
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 /gnu/system.scm
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>
Diffstat (limited to 'gnu/system.scm')
-rw-r--r--gnu/system.scm11
1 files changed, 6 insertions, 5 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