diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2020-05-23 19:10:28 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2020-05-29 09:12:11 +0200 |
| commit | e3f0155c41b28510f77e113ca2d37f0e7d90a2ca (patch) | |
| tree | 7c45059e84ab154f5f0f4acd8481042fcbb66079 /gnu/ci.scm | |
| parent | b7b45372e713a53ffa852aec1d3bfb743bb79124 (diff) | |
| download | guix-patches-e3f0155c41b28510f77e113ca2d37f0e7d90a2ca.tar guix-patches-e3f0155c41b28510f77e113ca2d37f0e7d90a2ca.tar.gz | |
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.
Diffstat (limited to 'gnu/ci.scm')
| -rw-r--r-- | gnu/ci.scm | 20 |
1 files changed, 11 insertions, 9 deletions
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 @@ system.") (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 |