summary refs log tree commit diff
path: root/gnu/system
diff options
context:
space:
mode:
authorMathieu Othacehe <othacehe@gnu.org>2020-06-14 17:59:07 +0200
committerMathieu Othacehe <othacehe@gnu.org>2020-06-14 18:03:08 +0200
commitc9f6e2e5bdff186583bdc360832b57f4c56e3427 (patch)
tree83c2ee3e95dbc7f404ceb0e9a5b72b30f3790010 /gnu/system
parent39b63d06e120ee25f72fa74d22173bf092849382 (diff)
downloadguix-c9f6e2e5bdff186583bdc360832b57f4c56e3427.tar.gz
system: image: Make sure target is set.
* gnu/system/image.scm (system-image): Move "with-parameters" call so that it
encapsulates "operating-system-bootcfg".
Diffstat (limited to 'gnu/system')
-rw-r--r--gnu/system/image.scm18
1 files changed, 9 insertions, 9 deletions
diff --git a/gnu/system/image.scm b/gnu/system/image.scm
index fa736b0fca..26ffa028fe 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*