01/05: guix system: Fix 'init'.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 1d6669afef5d73f5be8a025941edb86890e71536
Author: Ludovic Courtès <address@hidden>
Date:   Mon Nov 19 09:38:08 2018 +0100

    guix system: Fix 'init'.
    
    Fixes a regression introduced in
    52ee4479ef26826a53b9929cd00ca7738be687b1, whereby 'install' would now be
    passed a <computed-file> object instead of a derivation.
    
    * guix/scripts/system.scm (install): Call 'lower-object' on BOOTCFG.
---
 guix/scripts/system.scm | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 6cf3704..00d2fe4 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -251,21 +251,21 @@ the ownership of '~a' may be incorrect!~%")
         (format   (lift format %store-monad))
         (populate (lift2 populate-root-file-system %store-monad)))
 
-    (mbegin %store-monad
-      ;; Copy the closure of BOOTCFG, which includes OS-DIR,
-      ;; eventual background image and so on.
-      (maybe-copy
-       (derivation->output-path bootcfg))
-
-      ;; Create a bunch of additional files.
-      (format log-port "populating '~a'...~%" target)
-      (populate os-dir target)
-
-      (mwhen install-bootloader?
-        (install-bootloader bootloader-installer
-                            #:bootcfg bootcfg
-                            #:bootcfg-file bootcfg-file
-                            #:target target)))))
+    (mlet %store-monad ((bootcfg (lower-object bootcfg)))
+      (mbegin %store-monad
+        ;; Copy the closure of BOOTCFG, which includes OS-DIR,
+        ;; eventual background image and so on.
+        (maybe-copy (derivation->output-path bootcfg))
+
+        ;; Create a bunch of additional files.
+        (format log-port "populating '~a'...~%" target)
+        (populate os-dir target)
+
+        (mwhen install-bootloader?
+          (install-bootloader bootloader-installer
+                              #:bootcfg bootcfg
+                              #:bootcfg-file bootcfg-file
+                              #:target target))))))
 
 
 ;;;