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:
parent
39b63d06e1
commit
c9f6e2e5bd
1 changed files with 8 additions and 8 deletions
|
@ -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
|
"Return the derivation of IMAGE. It can be a raw disk-image or an ISO9660
|
||||||
image, depending on IMAGE format."
|
image, depending on IMAGE format."
|
||||||
(define substitutable? (image-substitutable? image))
|
(define substitutable? (image-substitutable? image))
|
||||||
|
(define target (image-target image))
|
||||||
|
|
||||||
|
(with-parameters ((%current-target-system target))
|
||||||
(let* ((os (operating-system-for-image image))
|
(let* ((os (operating-system-for-image image))
|
||||||
(image* (image-with-os image os))
|
(image* (image-with-os image os))
|
||||||
(target (image-target image))
|
|
||||||
(register-closures? (has-guix-service-type? os))
|
(register-closures? (has-guix-service-type? os))
|
||||||
(bootcfg (operating-system-bootcfg os))
|
(bootcfg (operating-system-bootcfg os))
|
||||||
(bootloader (bootloader-configuration-bootloader
|
(bootloader (bootloader-configuration-bootloader
|
||||||
(operating-system-bootloader os))))
|
(operating-system-bootloader os))))
|
||||||
(with-parameters ((%current-target-system target))
|
|
||||||
(case (image-format image)
|
(case (image-format image)
|
||||||
((disk-image)
|
((disk-image)
|
||||||
(system-disk-image image*
|
(system-disk-image image*
|
||||||
|
|
Reference in a new issue