system: image: Make sure target is set.

* gnu/system/image.scm (system-image): Move "with-parameters" call so that it
encapsulates "operating-system-bootcfg".
This commit is contained in:
Mathieu Othacehe 2020-06-14 17:59:07 +02:00
parent 39b63d06e1
commit c9f6e2e5bd
No known key found for this signature in database
GPG key ID: 8354763531769CA6

View file

@ -524,15 +524,15 @@ (define* (system-image image)
"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))
(define target (image-target 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))
(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*