diff options
| author | Danny Milosavljevic <dannym@scratchpost.org> | 2017-04-21 14:37:13 +0200 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@scratchpost.org> | 2017-05-05 15:03:48 +0200 |
| commit | bf8b09169c7d8ae48ac99ea237b82867ee9aa885 (patch) | |
| tree | a9230a5a577cbb5a1983ff8065fd63345eeb266a /gnu | |
| parent | 370ae085b5107a0928fd744a987fb4070bdf6a00 (diff) | |
| download | guix-bf8b09169c7d8ae48ac99ea237b82867ee9aa885.tar guix-bf8b09169c7d8ae48ac99ea237b82867ee9aa885.tar.gz | |
system: grub: Use boot-parameters instead of menu-entry where possible.
* gnu/system/grub.scm (boot-parameters->menu-entry): New variable.
(grub-configuration-file): Use boot-parameters
instead of menu-entry where possible.
* guix/scripts/system.scm (profile-boot-parameters): Update docstring.
(reinstall-grub): Use profile-boot-parameters.
(perform-action): Use profile-boot-parameters.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/system/grub.scm | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/gnu/system/grub.scm b/gnu/system/grub.scm index cde4b9e23a..d2fa984ec7 100644 --- a/gnu/system/grub.scm +++ b/gnu/system/grub.scm @@ -267,6 +267,16 @@ code." (#f #~(format #f "search --file --set ~a" #$file))))) +(define (boot-parameters->menu-entry conf) + "Convert a <boot-parameters> instance to a corresponding <menu-entry>." + (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)) @@ -276,7 +286,7 @@ 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 + (append (map boot-parameters->menu-entry entries) (grub-configuration-menu-entries config))) (define entry->gexp @@ -323,7 +333,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 "}~%")) #~())))) |