diff options
| author | Danny Milosavljevic <dannym@scratchpost.org> | 2017-04-15 22:02:38 +0200 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@scratchpost.org> | 2017-04-15 22:02:38 +0200 |
| commit | 958a1fda9e0ad41468cbdb88766e7c854dd32df4 (patch) | |
| tree | 2e74aa2e9c58827dabed7d6b14ba58158cb99f6f /gnu | |
| parent | 2f36d90f2d24738bda8dc522645ad8f50bd62207 (diff) | |
| download | guix-958a1fda9e0ad41468cbdb88766e7c854dd32df4.tar 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')
| -rw-r--r-- | gnu/system.scm | 11 | ||||
| -rw-r--r-- | gnu/system/grub.scm | 13 |
2 files changed, 7 insertions, 17 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 diff --git a/gnu/system/grub.scm b/gnu/system/grub.scm index f2838d633d..cde4b9e23a 100644 --- a/gnu/system/grub.scm +++ b/gnu/system/grub.scm @@ -267,15 +267,6 @@ code." (#f #~(format #f "search --file --set ~a" #$file))))) -(define (boot-parameters->menu-entry conf) - (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)) @@ -285,7 +276,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 (map boot-parameters->menu-entry entries) + (append entries (grub-configuration-menu-entries config))) (define entry->gexp @@ -332,7 +323,7 @@ set timeout=~a~%" #$@(if (pair? old-entries) #~((format port " submenu \"GNU system, old configurations...\" {~%") - #$@(map entry->gexp (map boot-parameters->menu-entry old-entries)) + #$@(map entry->gexp old-entries) (format port "}~%")) #~())))) |