mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 07:26:13 -05:00
system: 'operating-system-boot-parameters-file' uses 'scheme-file'.
* 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:
parent
34faf63ebc
commit
2e37d1583a
1 changed files with 24 additions and 23 deletions
|
@ -485,7 +485,7 @@ (define* (operating-system-directory-base-entries os)
|
|||
(cons kernel modules))
|
||||
#:hooks (list linux-module-database)))
|
||||
(initrd -> (operating-system-initrd-file os))
|
||||
(params (operating-system-boot-parameters-file os)))
|
||||
(params -> (operating-system-boot-parameters-file os)))
|
||||
(return `(("kernel" ,kernel)
|
||||
("parameters" ,params)
|
||||
("initrd" ,initrd)
|
||||
|
@ -1078,7 +1078,7 @@ (define* (operating-system-boot-parameters-file os
|
|||
os device
|
||||
#:system-kernel-arguments?
|
||||
system-kernel-arguments?)))
|
||||
(gexp->file "parameters"
|
||||
(scheme-file "parameters"
|
||||
#~(boot-parameters
|
||||
(version 0)
|
||||
(label #$(boot-parameters-label params))
|
||||
|
@ -1098,7 +1098,8 @@ (define* (operating-system-boot-parameters-file os
|
|||
(store
|
||||
(device
|
||||
#$(device->sexp (boot-parameters-store-device params)))
|
||||
(mount-point #$(boot-parameters-store-mount-point params))))
|
||||
(mount-point #$(boot-parameters-store-mount-point
|
||||
params))))
|
||||
#:set-load-path? #f)))
|
||||
|
||||
(define-gexp-compiler (operating-system-compiler (os <operating-system>)
|
||||
|
|
Loading…
Reference in a new issue