summaryrefslogtreecommitdiff
path: root/gnu/bootloader.scm
diff options
context:
space:
mode:
authorDanny Milosavljevic <dannym@scratchpost.org>2017-06-29 12:42:59 +0200
committerDanny Milosavljevic <dannym@scratchpost.org>2017-07-28 21:56:18 +0200
commit1975c754f487eb4933724ca3b116442d21ef8dd9 (patch)
tree6b6ffb984416b197135118ff0222c3ec85e53434 /gnu/bootloader.scm
parent9ca8aa38ecce0b0651a0ff394ee4ce32bdd0bb41 (diff)
bootloader: Use <menu-entry> for the bootloader side.
* gnu/bootloader.scm (menu-entry-device-mount-point): New variable. Export it. (<menu-entry>: New field "device". * gnu/bootloader/grub.scm (grub-confgiuration-file): Handle <menu-entry> entries. * gnu/bootloader/extlinux.scm (extlinux-configuration-file): Handle <menu-entry> entries. * gnu/system.scm (menu->entry->boot-parameters): Delete variable. (boot-parameters->menu-entry): New variable. Export it. (operating-system-bootcfg): Make OLD-ENTRIES a list of <menu-entry>. * guix/script/system.scm (reinstall-bootloader): Fix bootcfg usage. (perform-action): Fix bootcfg usage.
Diffstat (limited to 'gnu/bootloader.scm')
-rw-r--r--gnu/bootloader.scm3
1 files changed, 3 insertions, 0 deletions
diff --git a/gnu/bootloader.scm b/gnu/bootloader.scm
index d5fcf30f056..e080b04568b 100644
--- a/gnu/bootloader.scm
+++ b/gnu/bootloader.scm
@@ -30,6 +30,7 @@
30 menu-entry-linux 30 menu-entry-linux
31 menu-entry-linux-arguments 31 menu-entry-linux-arguments
32 menu-entry-initrd 32 menu-entry-initrd
33 menu-entry-device-mount-point
33 34
34 bootloader 35 bootloader
35 bootloader? 36 bootloader?
@@ -67,6 +68,8 @@
67 (label menu-entry-label) 68 (label menu-entry-label)
68 (device menu-entry-device ; file system uuid, label, or #f 69 (device menu-entry-device ; file system uuid, label, or #f
69 (default #f)) 70 (default #f))
71 (device-mount-point menu-entry-device-mount-point
72 (default #f))
70 (linux menu-entry-linux) 73 (linux menu-entry-linux)
71 (linux-arguments menu-entry-linux-arguments 74 (linux-arguments menu-entry-linux-arguments
72 (default '())) ; list of string-valued gexps 75 (default '())) ; list of string-valued gexps