diff options
author | Jan (janneke) Nieuwenhuizen <janneke@gnu.org> | 2020-06-11 22:52:12 +0200 |
---|---|---|
committer | Jan Nieuwenhuizen <janneke@gnu.org> | 2020-06-13 15:03:55 +0200 |
commit | 7ca533c7237622d70b423033c4506217d9ce4014 (patch) | |
tree | 4a4d6e3c9def39dcf3a511089b34f060be3d4d82 /guix/scripts | |
parent | 3857aba7ab25c50d64a6d7468d2b5b09bc4f5d60 (diff) |
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 'guix/scripts')
-rw-r--r-- | guix/scripts/system.scm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 3d7aa77cb7..6769a602b1 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017, 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019 Christopher Baines <mail@cbaines.net> +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -801,7 +802,8 @@ static checks." (check-initrd-modules os))) (mlet* %store-monad - ((image (find-image file-system-type)) + ((target (current-target-system)) + (image -> (find-image file-system-type target)) (sys (system-derivation-for-action os image action #:file-system-type file-system-type #:image-size image-size |