aboutsummaryrefslogtreecommitdiff
path: root/gnu/system
diff options
context:
space:
mode:
authorJan (janneke) Nieuwenhuizen <janneke@gnu.org>2020-06-11 22:52:12 +0200
committerJan Nieuwenhuizen <janneke@gnu.org>2020-06-13 15:03:55 +0200
commit7ca533c7237622d70b423033c4506217d9ce4014 (patch)
tree4a4d6e3c9def39dcf3a511089b34f060be3d4d82 /gnu/system
parent3857aba7ab25c50d64a6d7468d2b5b09bc4f5d60 (diff)
downloadguix-7ca533c7237622d70b423033c4506217d9ce4014.tar
guix-7ca533c7237622d70b423033c4506217d9ce4014.tar.gz
image: Make 'find-image' non-monadic.
* gnu/system/image.scm (find-image): Make non-monadic. Add 'target' parameter. * gnu/tests/install.scm (run-install): Update caller, passing (%current-target-system). * guix/scripts/system.scm (perform-action): Likewise.
Diffstat (limited to 'gnu/system')
-rw-r--r--gnu/system/image.scm28
1 files changed, 13 insertions, 15 deletions
diff --git a/gnu/system/image.scm b/gnu/system/image.scm
index 6c4573509d..be8b6e67f7 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -556,20 +557,17 @@ image, depending on IMAGE format."
#:grub-mkrescue-environment
'(("MKRESCUE_SED_MODE" . "mbr_only")))))))
-(define (find-image file-system-type)
- "Find and return an image that could match the given FILE-SYSTEM-TYPE. This
-is useful to adapt to interfaces written before the addition of the <image>
-record."
- (mlet %store-monad ((target (current-target-system)))
- (mbegin %store-monad
- (return
- (match file-system-type
- ("iso9660" iso9660-image)
- (_ (cond
- ((and target
- (hurd-triplet? target))
- hurd-disk-image)
- (else
- efi-disk-image))))))))
+(define (find-image file-system-type target)
+ "Find and return an image built that could match the given FILE-SYSTEM-TYPE,
+built for TARGET. This is useful to adapt to interfaces written before the
+addition of the <image> record."
+ (match file-system-type
+ ("iso9660" iso9660-image)
+ (_ (cond
+ ((and target
+ (hurd-triplet? target))
+ hurd-disk-image)
+ (else
+ efi-disk-image)))))
;;; image.scm ends here