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

system: Pass boot-parameters to (gnu system grub). 

* gnu/system.scm (operating-system-bootcfg): Pass boot-parameters.
* gnu/system/grub.scm (boot-parameters->menu-entry): New variable.
(grub-configuration-file): Use boot-parameters->menu-entry.

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
This commit is contained in:
Mathieu Othacehe 2017-04-15 16:19:06 +02:00 committed by Danny Milosavljevic
parent 0ab1e8ae88
commit 2e58e05bb6
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gnu/system.scm
View File

@ -742,16 +742,17 @@ 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 (menu-entry (entries -> (list (boot-parameters
(label label) (label label)
(root-device root-device)
;; The device where the kernel and initrd live. ;; The device where the kernel and initrd live.
(device (fs->boot-device store-fs)) (store-device (fs->boot-device store-fs))
(device-mount-point (store-mount-point
(file-system-mount-point store-fs)) (file-system-mount-point store-fs))
(linux kernel) (kernel kernel)
(linux-arguments (kernel-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

15
gnu/system/grub.scm
View File

@ -26,6 +26,7 @@
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix download) #:use-module (guix download)
#:use-module (gnu artwork) #:use-module (gnu artwork)
#:use-module (gnu system)
#:use-module (gnu system file-systems) #:use-module (gnu system file-systems)
#:autoload (gnu packages bootloaders) (grub) #:autoload (gnu packages bootloaders) (grub)
#:autoload (gnu packages compression) (gzip) #:autoload (gnu packages compression) (gzip)
@ -266,6 +267,15 @@ 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))
@ -275,7 +285,8 @@ 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 entries (grub-configuration-menu-entries config))) (append (map boot-parameters->menu-entry entries)
(grub-configuration-menu-entries config)))
(define entry->gexp (define entry->gexp
(match-lambda (match-lambda
@ -321,7 +332,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 old-entries) #$@(map entry->gexp (map boot-parameters->menu-entry old-entries))
(format port "}~%")) (format port "}~%"))
#~())))) #~()))))