From 9782c82217f5bdfe8d47a5a3e14af47e3c3e5dd7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 16 Nov 2018 08:50:44 +0100 Subject: 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. --- guix/scripts/system.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'guix') diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 9ba9428a08..c0f16cb2a7 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -858,12 +858,13 @@ static checks." (return #f)))) (bootcfg (if (eq? 'container action) (return #f) - (operating-system-bootcfg - os - (if (eq? 'init action) - '() - (map boot-parameters->menu-entry - (profile-boot-parameters)))))) + (lower-object + (operating-system-bootcfg + os + (if (eq? 'init action) + '() + (map boot-parameters->menu-entry + (profile-boot-parameters))))))) (bootcfg-file -> (bootloader-configuration-file bootloader)) (bootloader-installer (let ((installer (bootloader-installer bootloader)) -- cgit v1.2.3