From e3f0155c41b28510f77e113ca2d37f0e7d90a2ca Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 23 May 2020 19:10:28 +0200 Subject: image: Do not use VM to create disk-images. Now that installing Grub on raw disk-images is supported, we do not need to rely on (gnu system vm) module. * gnu/system/image.scm (make-system-image): Rename to ... (system-image): ... this, and remove the compatibility wrapper. (find-image): Turn to a monadic procedure. This will become useful when introducing Hurd support, to be able to detect the target system. * gnu/ci.scm (qemu-jobs): Use lower-object now that system-image returns a file-like object. * gnu/tests/install.scm (run-install): Ditto. * guix/scripts/system.scm (system-derivation-for-action): Add a 'base-image' argument, (perform-action): adapt accordingly. --- gnu/ci.scm | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'gnu/ci.scm') diff --git a/gnu/ci.scm b/gnu/ci.scm index b61181be51..fa67168e22 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -219,19 +219,21 @@ (define MiB (run-with-store store (mbegin %store-monad (set-guile-for-build (default-guile)) - (system-image - (image - (inherit efi-disk-image) - (size (* 1500 MiB)) - (operating-system installation-os)))))) + (lower-object + (system-image + (image + (inherit efi-disk-image) + (size (* 1500 MiB)) + (operating-system installation-os))))))) (->job 'iso9660-image (run-with-store store (mbegin %store-monad (set-guile-for-build (default-guile)) - (system-image - (image - (inherit iso9660-image) - (operating-system installation-os))))))) + (lower-object + (system-image + (image + (inherit iso9660-image) + (operating-system installation-os)))))))) '())) (define channel-build-system -- cgit v1.2.3