diff options
| author | Mathieu Othacehe <m.othacehe@gmail.com> | 2020-06-13 16:55:12 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2020-06-13 16:58:57 +0200 |
| commit | 4a04d49c2e8aa52b0e6051c6868c8892d017e61b (patch) | |
| tree | 1a1a75db4b2fdd8db75ce5676ea789051d23447f /gnu | |
| parent | 478d1270ce4029b7fe5bfbb369f8e35c57b32ab2 (diff) | |
| download | guix-4a04d49c2e8aa52b0e6051c6868c8892d017e61b.tar.gz | |
image: Remove 'maybe-with-target'.
* gnu/system/image.scm (maybe-with-target): Remove, (system-image): adapt accordingly.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/system/image.scm | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 97e4bb0e3c..1bda25fd7f 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -520,14 +520,6 @@ it can be used for bootloading." (type root-file-system-type)) 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) "Return the derivation of IMAGE. It can be a raw disk-image or an ISO9660 image, depending on IMAGE format." @@ -535,11 +527,12 @@ image, depending on IMAGE format." (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)))) - (maybe-with-target image + (with-parameters ((%current-target-system target)) (case (image-format image) ((disk-image) (system-disk-image image* |