ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 06:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

system: 'operating-system-boot-parameters-file' uses 'scheme-file'.

Browse source 
* gnu/system.scm (operating-system-boot-parameters-file): Use
'scheme-file' instead of 'gexp->file'.
(operating-system-directory-base-entries): Adjust accordingly.
This commit is contained in:
Ludovic Courtès 2020-04-22 15:03:51 +02:00
parent 34faf63ebc
commit 2e37d1583a
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
gnu/system.scm
View file

@ -485,7 +485,7 @@ (define* (operating-system-directory-base-entries os)
(cons kernel modules)) (cons kernel modules))
#:hooks (list linux-module-database))) #:hooks (list linux-module-database)))
(initrd -> (operating-system-initrd-file os)) (initrd -> (operating-system-initrd-file os))
(params (operating-system-boot-parameters-file os))) (params -> (operating-system-boot-parameters-file os)))
(return `(("kernel" ,kernel) (return `(("kernel" ,kernel)
("parameters" ,params) ("parameters" ,params)
("initrd" ,initrd) ("initrd" ,initrd)
@ -1078,28 +1078,29 @@ (define* (operating-system-boot-parameters-file os
os device os device
#:system-kernel-arguments? #:system-kernel-arguments?
system-kernel-arguments?))) system-kernel-arguments?)))
(gexp->file "parameters" (scheme-file "parameters"
#~(boot-parameters #~(boot-parameters
(version 0) (version 0)
(label #$(boot-parameters-label params)) (label #$(boot-parameters-label params))
(root-device (root-device
#$(device->sexp #$(device->sexp
(boot-parameters-root-device params))) (boot-parameters-root-device params)))
(kernel #$(boot-parameters-kernel params)) (kernel #$(boot-parameters-kernel params))
(kernel-arguments (kernel-arguments
#$(boot-parameters-kernel-arguments params)) #$(boot-parameters-kernel-arguments params))
(initrd #$(boot-parameters-initrd params)) (initrd #$(boot-parameters-initrd params))
(bootloader-name #$(boot-parameters-bootloader-name params)) (bootloader-name #$(boot-parameters-bootloader-name params))
(bootloader-menu-entries (bootloader-menu-entries
#$(map menu-entry->sexp #$(map menu-entry->sexp
(or (and=> (operating-system-bootloader os) (or (and=> (operating-system-bootloader os)
bootloader-configuration-menu-entries) bootloader-configuration-menu-entries)
'()))) '())))
(store (store
(device (device
#$(device->sexp (boot-parameters-store-device params))) #$(device->sexp (boot-parameters-store-device params)))
(mount-point #$(boot-parameters-store-mount-point params)))) (mount-point #$(boot-parameters-store-mount-point
#:set-load-path? #f))) params))))
#:set-load-path? #f)))
(define-gexp-compiler (operating-system-compiler (os <operating-system>) (define-gexp-compiler (operating-system-compiler (os <operating-system>)
system target) system target)