amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

image: Do not use VM to create disk-images.

Browse source 
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.
This commit is contained in:
Mathieu Othacehe 2020-05-23 19:10:28 +02:00
parent b7b45372e7
commit e3f0155c41
No known key found for this signature in database
GPG key ID: 8354763531769CA6
4 changed files with 30 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

16
guix/scripts/system.scm
View file

@ -670,7 +670,7 @@ checking this by themselves in their 'check' procedure."
;;; Action.
;;;
(define* (system-derivation-for-action os action
(define* (system-derivation-for-action os base-image action
#:key image-size file-system-type
full-boot? container-shared-network?
mappings)
@ -694,11 +694,12 @@ checking this by themselves in their 'check' procedure."
(* 70 (expt 2 20)))
#:mappings mappings))
((disk-image)
(system-image
(image
(inherit (find-image file-system-type))
(size image-size)
(operating-system os))))
(lower-object
(system-image
(image
(inherit base-image)
(size image-size)
(operating-system os)))))
((docker-image)
(system-docker-image os #:shared-network? container-shared-network?))))
@ -800,7 +801,8 @@ static checks."
(check-initrd-modules os)))
(mlet* %store-monad
((sys (system-derivation-for-action os action
((image (find-image file-system-type))
(sys (system-derivation-for-action os image action
#:file-system-type file-system-type
#:image-size image-size
#:full-boot? full-boot?