summaryrefslogtreecommitdiff
path: root/gnu/system.scm
diff options
context:
space:
mode:
authorDanny Milosavljevic <dannym@scratchpost.org>2017-04-15 22:02:38 +0200
committerDanny Milosavljevic <dannym@scratchpost.org>2017-04-15 22:02:38 +0200
commit958a1fda9e0ad41468cbdb88766e7c854dd32df4 (patch)
tree2e74aa2e9c58827dabed7d6b14ba58158cb99f6f /gnu/system.scm
parent2f36d90f2d24738bda8dc522645ad8f50bd62207 (diff)
downloadgnu-guix-958a1fda9e0ad41468cbdb88766e7c854dd32df4.tar
gnu-guix-958a1fda9e0ad41468cbdb88766e7c854dd32df4.tar.gz
system: Make grub use <menu-entry> instead of <boot-parameters> again.
* gnu/system/grub.scm: Remove boot-parameters->menu-entry. (grub-configuration): Don't use boot-parameters->menu-entry. * gnu/system.scm (operating-system-bootcfg): Use menu-entry. * guix/scripts/system.scm (reinstall-grub): Use profile-grub-entries. (perform-action): Use profile-grub-entries.
Diffstat (limited to 'gnu/system.scm')
-rw-r--r--gnu/system.scm11
1 files changed, 5 insertions, 6 deletions
diff --git a/gnu/system.scm b/gnu/system.scm
index 4721668ba3..69cbc8a081 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -742,17 +742,16 @@ 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 (boot-parameters
+ (entries -> (list (menu-entry
(label label)
- (root-device root-device)
;; The device where the kernel and initrd live.
- (store-device (fs->boot-device store-fs))
- (store-mount-point
+ (device (fs->boot-device store-fs))
+ (device-mount-point
(file-system-mount-point store-fs))
- (kernel kernel)
- (kernel-arguments
+ (linux kernel)
+ (linux-arguments
(cons* (string-append "--root=" root-device)
#~(string-append "--system=" #$system)
#~(string-append "--load=" #$system