nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Danny Milosavljevic 2017-04-15 22:02:38 +02:00
parent 2f36d90f2d
commit 958a1fda9e
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
3 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gnu/system.scm
View File

@ -742,17 +742,16 @@ populate the \"old entries\" menu."
(root-device -> (if (eq? 'uuid (file-system-title root-fs)) (root-device -> (if (eq? 'uuid (file-system-title root-fs))
(uuid->string (file-system-device root-fs)) (uuid->string (file-system-device root-fs))
(file-system-device root-fs))) (file-system-device root-fs)))
(entries -> (list (boot-parameters (entries -> (list (menu-entry
(label label) (label label)
(root-device root-device)
;; The device where the kernel and initrd live. ;; The device where the kernel and initrd live.
(store-device (fs->boot-device store-fs)) (device (fs->boot-device store-fs))
(store-mount-point (device-mount-point
(file-system-mount-point store-fs)) (file-system-mount-point store-fs))
(kernel kernel) (linux kernel)
(kernel-arguments (linux-arguments
(cons* (string-append "--root=" root-device) (cons* (string-append "--root=" root-device)
#~(string-append "--system=" #$system) #~(string-append "--system=" #$system)
#~(string-append "--load=" #$system #~(string-append "--load=" #$system

13
gnu/system/grub.scm
View File

@ -267,15 +267,6 @@ code."
(#f (#f
#~(format #f "search --file --set ~a" #$file))))) #~(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 (define* (grub-configuration-file config entries
#:key #:key
(system (%current-system)) (system (%current-system))
@ -285,7 +276,7 @@ code."
<file-system> object. OLD-ENTRIES is taken to be a list of menu entries <file-system> object. OLD-ENTRIES is taken to be a list of menu entries
corresponding to old generations of the system." corresponding to old generations of the system."
(define all-entries (define all-entries
(append (map boot-parameters->menu-entry entries) (append entries
(grub-configuration-menu-entries config))) (grub-configuration-menu-entries config)))
(define entry->gexp (define entry->gexp
@ -332,7 +323,7 @@ set timeout=~a~%"
#$@(if (pair? old-entries) #$@(if (pair? old-entries)
#~((format port " #~((format port "
submenu \"GNU system, old configurations...\" {~%") submenu \"GNU system, old configurations...\" {~%")
#$@(map entry->gexp (map boot-parameters->menu-entry old-entries)) #$@(map entry->gexp old-entries)
(format port "}~%")) (format port "}~%"))
#~())))) #~()))))

6
guix/scripts/system.scm
View File

@ -456,9 +456,9 @@ open connection to the store."
;; from the actual past values for this generation's entry. ;; from the actual past values for this generation's entry.
(grub-config (grub-configuration (device root-device))) (grub-config (grub-configuration (device root-device)))
;; Make the specified system generation the default entry. ;; Make the specified system generation the default entry.
(entries (profile-boot-parameters %system-profile (list number))) (entries (profile-grub-entries %system-profile (list number)))
(old-generations (delv number (generation-numbers %system-profile))) (old-generations (delv number (generation-numbers %system-profile)))
(old-entries (profile-boot-parameters %system-profile old-generations)) (old-entries (profile-grub-entries %system-profile old-generations))
(grub.cfg (run-with-store store (grub.cfg (run-with-store store
(grub-configuration-file grub-config (grub-configuration-file grub-config
entries entries
@ -643,7 +643,7 @@ output when building a system derivation, such as a disk image."
(operating-system-bootcfg os (operating-system-bootcfg os
(if (eq? 'init action) (if (eq? 'init action)
'() '()
(profile-boot-parameters))))) (profile-grub-entries)))))
;; For 'init' and 'reconfigure', always build GRUB.CFG, even if ;; For 'init' and 'reconfigure', always build GRUB.CFG, even if
;; --no-grub is passed, because GRUB.CFG because we then use it as a GC ;; --no-grub is passed, because GRUB.CFG because we then use it as a GC