me
/
guix
Archived
1
0
Fork 0
Code

image: Remove 'maybe-with-target'. 

* gnu/system/image.scm (maybe-with-target): Remove,
(system-image): adapt accordingly.
master
Mathieu Othacehe 2020-06-13 16:55:12 +02:00 committed by Mathieu Othacehe
parent 478d1270ce
commit 4a04d49c2e
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gnu/system/image.scm
View File

@ -520,14 +520,6 @@ it can be used for bootloading."
(type root-file-system-type)) (type root-file-system-type))
file-systems-to-keep))))) file-systems-to-keep)))))
(define-syntax-rule (maybe-with-target image exp ...)
(let ((target (image-target image)))
(if target
(with-parameters ((%current-target-system target))
exp ...)
(begin
exp ...))))
(define* (system-image image) (define* (system-image image)
"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."
@ -535,11 +527,12 @@ image, depending on IMAGE format."
(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))))
(maybe-with-target image (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*