diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-11-16 08:50:44 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-11-18 23:37:45 +0100 |
| commit | 9782c82217f5bdfe8d47a5a3e14af47e3c3e5dd7 (patch) | |
| tree | 186c29398f5890e6f2ac9537a2678f5e64fabf84 /gnu/system.scm | |
| parent | 5ece56dc7385e45542fabc290df420ed6a527918 (diff) | |
| download | gnu-guix-9782c82217f5bdfe8d47a5a3e14af47e3c3e5dd7.tar gnu-guix-9782c82217f5bdfe8d47a5a3e14af47e3c3e5dd7.tar.gz | |
system: De-monadify 'operating-system-bootcfg'.
* gnu/system.scm (operating-system-bootcfg): Remove 'mlet*' and
'lower-object' call.
* gnu/system/vm.scm (system-disk-image)
(system-qemu-image/shared-store): Adjust accordingly.
* guix/scripts/system.scm (perform-action): Add 'lower-object' call for
BOOTCFG.
Diffstat (limited to 'gnu/system.scm')
| -rw-r--r-- | gnu/system.scm | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index 96b3b7d0e0..1766c8f90f 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -935,21 +935,19 @@ listed in OS. The C library expects to find it under (define* (operating-system-bootcfg os #:optional (old-entries '())) "Return the bootloader configuration file for OS. Use OLD-ENTRIES, a list of <menu-entry>, to populate the \"old entries\" menu." - (mlet* %store-monad - ((root-fs -> (operating-system-root-file-system os)) - (root-device -> (file-system-device root-fs)) - (params -> (operating-system-boot-parameters os root-device - #:system-kernel-arguments? - #t)) - (entry -> (boot-parameters->menu-entry params)) - (bootloader-conf -> (operating-system-bootloader os))) + (let* ((root-fs (operating-system-root-file-system os)) + (root-device (file-system-device root-fs)) + (params (operating-system-boot-parameters + os root-device + #:system-kernel-arguments? #t)) + (entry (boot-parameters->menu-entry params)) + (bootloader-conf (operating-system-bootloader os))) (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)))) + (generate-config-file bootloader-conf (list entry) + #:old-entries old-entries))) (define* (operating-system-boot-parameters os root-device #:key system-kernel-arguments?) |