aboutsummaryrefslogtreecommitdiff
path: root/gnu/tests
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/tests
parent3857aba7ab25c50d64a6d7468d2b5b09bc4f5d60 (diff)
downloadguix-7ca533c7237622d70b423033c4506217d9ce4014.tar.gz
guix-7ca533c7237622d70b423033c4506217d9ce4014.zip
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/tests')
-rw-r--r--gnu/tests/install.scm9
1 files changed, 6 insertions, 3 deletions
diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm
index 6bd8c7d3d2..db355b85ca 100644
--- a/gnu/tests/install.scm
+++ b/gnu/tests/install.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -227,15 +228,17 @@ packages defined in installation-os."
(mlet* %store-monad ((_ (set-grafting #f))
(system (current-system))
- (target (operating-system-derivation target-os))
- (base-image (find-image
- installation-disk-image-file-system-type))
+ (target (current-target-system))
+ (base-image -> (find-image
+ installation-disk-image-file-system-type
+ target))
;; Since the installation system has no network access,
;; we cheat a little bit by adding TARGET to its GC
;; roots. This way, we know 'guix system init' will
;; succeed. Also add guile-final, which is pulled in
;; through provenance.drv and may not always be present.
+ (target (operating-system-derivation target-os))
(image ->
(system-image
(image