summaryrefslogtreecommitdiff
path: root/gnu/bootloader/extlinux.scm
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/bootloader/extlinux.scm')
-rw-r--r--gnu/bootloader/extlinux.scm19
1 files changed, 9 insertions, 10 deletions
diff --git a/gnu/bootloader/extlinux.scm b/gnu/bootloader/extlinux.scm
index 219b058e53e..e5fdeb5801e 100644
--- a/gnu/bootloader/extlinux.scm
+++ b/gnu/bootloader/extlinux.scm
@@ -38,14 +38,13 @@
38corresponding to old generations of the system." 38corresponding to old generations of the system."
39 39
40 (define all-entries 40 (define all-entries
41 (append entries (map menu-entry->boot-parameters 41 (append entries (bootloader-configuration-menu-entries config)))
42 (bootloader-configuration-menu-entries config)))) 42
43 43 (define (menu-entry->gexp entry)
44 (define (boot-parameters->gexp params) 44 (let ((label (menu-entry-label entry))
45 (let ((label (boot-parameters-label params)) 45 (kernel (menu-entry-linux entry))
46 (kernel (boot-parameters-kernel params)) 46 (kernel-arguments (menu-entry-linux-arguments entry))
47 (kernel-arguments (boot-parameters-kernel-arguments params)) 47 (initrd (menu-entry-initrd entry)))
48 (initrd (boot-parameters-initrd params)))
49 #~(format port "LABEL ~a 48 #~(format port "LABEL ~a
50 MENU LABEL ~a 49 MENU LABEL ~a
51 KERNEL ~a 50 KERNEL ~a
@@ -69,11 +68,11 @@ TIMEOUT ~a~%"
69 (if (> timeout 0) 1 0) 68 (if (> timeout 0) 1 0)
70 ;; timeout is expressed in 1/10s of seconds. 69 ;; timeout is expressed in 1/10s of seconds.
71 (* 10 timeout)) 70 (* 10 timeout))
72 #$@(map boot-parameters->gexp all-entries) 71 #$@(map menu-entry->gexp all-entries)
73 72
74 #$@(if (pair? old-entries) 73 #$@(if (pair? old-entries)
75 #~((format port "~%") 74 #~((format port "~%")
76 #$@(map boot-parameters->gexp old-entries) 75 #$@(map menu-entry->gexp old-entries)
77 (format port "~%")) 76 (format port "~%"))
78 #~()))))) 77 #~())))))
79 78