diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-11-15 13:32:07 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-11-18 23:37:44 +0100 |
| commit | 46c296dcc4817f15a4b4ef7e5ef622306b4db62e (patch) | |
| tree | 3d4ce8d6ff27295b1dbfd1ae267a50e8f339daaf /gnu/system.scm | |
| parent | b297934437932de730432629b361fcb422accbb7 (diff) | |
| download | guix-46c296dcc4817f15a4b4ef7e5ef622306b4db62e.tar guix-46c296dcc4817f15a4b4ef7e5ef622306b4db62e.tar.gz | |
bootloader: De-monadify configuration file generators.
* gnu/bootloader/extlinux.scm: Remove unneeded imports.
(extlinux-configuration-file): Use 'computed-file' instead of
'gexp->derivation'.
* gnu/bootloader/grub.scm (svg->png): Likewise.
(grub-background-image, eye-candy): Adjust accordingly, return
non-monadically.
(grub-configuration-file): Likewise, and use 'computed-file' instead of
'gexp->derivation'.
* gnu/bootloader/u-boot.scm: Remove unneeded imports.
* gnu/system.scm: Add 'lower-object' call.
Diffstat (limited to 'gnu/system.scm')
| -rw-r--r-- | gnu/system.scm | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index 99bc09873d..93340cccd2 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -948,9 +948,13 @@ listed in OS. The C library expects to find it under (params (operating-system-boot-parameters os system root-device)) (entry -> (boot-parameters->menu-entry params)) (bootloader-conf -> (operating-system-bootloader os))) - ((bootloader-configuration-file-generator - (bootloader-configuration-bootloader bootloader-conf)) - bootloader-conf (list entry) #:old-entries old-entries))) + (define generate-config-file + (bootloader-configuration-file-generator + (bootloader-configuration-bootloader bootloader-conf))) + + ;; TODO: Remove the 'lower-object' call to make it non-monadic. + (lower-object (generate-config-file bootloader-conf (list entry) + #:old-entries old-entries)))) (define (operating-system-boot-parameters os system.drv root-device) "Return a monadic <boot-parameters> record that describes the boot parameters |