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/tests | |
| parent | b7b45372e713a53ffa852aec1d3bfb743bb79124 (diff) | |
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/tests')
| -rw-r--r-- | gnu/tests/install.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index cea26c8ef3..6bd8c7d3d2 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -228,18 +228,18 @@ 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)) ;; 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. - (image + (image -> (system-image (image - (inherit - (find-image - installation-disk-image-file-system-type)) + (inherit base-image) (size install-size) (operating-system (operating-system-with-gc-roots |