civodul pushed a commit to branch master
in repository guix.
commit 2e37d1583a25fa824e6c4674cdc35994ec8091a7
Author: Ludovic Courtès <[email protected]>
AuthorDate: Wed Apr 22 15:03:51 2020 +0200
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.
---
gnu/system.scm | 47 ++++++++++++++++++++++++-----------------------
1 file changed, 24 insertions(+), 23 deletions(-)
diff --git a/gnu/system.scm b/gnu/system.scm
index d79ea23..fb48fed 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -485,7 +485,7 @@ value of the SYSTEM-SERVICE-TYPE service."
(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,28 +1078,29 @@ being stored into the \"parameters\" file)."
os device
#:system-kernel-arguments?
system-kernel-arguments?)))
- (gexp->file "parameters"
- #~(boot-parameters
- (version 0)
- (label #$(boot-parameters-label params))
- (root-device
- #$(device->sexp
- (boot-parameters-root-device params)))
- (kernel #$(boot-parameters-kernel params))
- (kernel-arguments
- #$(boot-parameters-kernel-arguments params))
- (initrd #$(boot-parameters-initrd params))
- (bootloader-name #$(boot-parameters-bootloader-name
params))
- (bootloader-menu-entries
- #$(map menu-entry->sexp
- (or (and=> (operating-system-bootloader os)
- bootloader-configuration-menu-entries)
- '())))
- (store
- (device
- #$(device->sexp (boot-parameters-store-device params)))
- (mount-point #$(boot-parameters-store-mount-point
params))))
- #:set-load-path? #f)))
+ (scheme-file "parameters"
+ #~(boot-parameters
+ (version 0)
+ (label #$(boot-parameters-label params))
+ (root-device
+ #$(device->sexp
+ (boot-parameters-root-device params)))
+ (kernel #$(boot-parameters-kernel params))
+ (kernel-arguments
+ #$(boot-parameters-kernel-arguments params))
+ (initrd #$(boot-parameters-initrd params))
+ (bootloader-name #$(boot-parameters-bootloader-name
params))
+ (bootloader-menu-entries
+ #$(map menu-entry->sexp
+ (or (and=> (operating-system-bootloader os)
+ bootloader-configuration-menu-entries)
+ '())))
+ (store
+ (device
+ #$(device->sexp (boot-parameters-store-device params)))
+ (mount-point #$(boot-parameters-store-mount-point
+ params))))
+ #:set-load-path? #f)))
(define-gexp-compiler (operating-system-compiler (os <operating-system>)
system target)
