branch master updated: system: image: Make sure target is set.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

mothacehe pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new c9f6e2e  system: image: Make sure target is set.
c9f6e2e is described below

commit c9f6e2e5bdff186583bdc360832b57f4c56e3427
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Sun Jun 14 17:59:07 2020 +0200

    system: image: Make sure target is set.
    
    * gnu/system/image.scm (system-image): Move "with-parameters" call so that 
it
    encapsulates "operating-system-bootcfg".
---
 gnu/system/image.scm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/gnu/system/image.scm b/gnu/system/image.scm
index fa736b0..26ffa02 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -524,15 +524,15 @@ it can be used for bootloading."
   "Return the derivation of IMAGE.  It can be a raw disk-image or an ISO9660
 image, depending on IMAGE format."
   (define substitutable? (image-substitutable? image))
-
-  (let* ((os (operating-system-for-image image))
-         (image* (image-with-os image os))
-         (target (image-target image))
-         (register-closures? (has-guix-service-type? os))
-         (bootcfg (operating-system-bootcfg os))
-         (bootloader (bootloader-configuration-bootloader
-                      (operating-system-bootloader os))))
-    (with-parameters ((%current-target-system target))
+  (define target (image-target image))
+
+  (with-parameters ((%current-target-system target))
+    (let* ((os (operating-system-for-image image))
+           (image* (image-with-os image os))
+           (register-closures? (has-guix-service-type? os))
+           (bootcfg (operating-system-bootcfg os))
+           (bootloader (bootloader-configuration-bootloader
+                        (operating-system-bootloader os))))
       (case (image-format image)
         ((disk-image)
          (system-disk-image image*