diff options
| author | Mathieu Othacehe <m.othacehe@gmail.com> | 2020-04-28 14:15:28 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <m.othacehe@gmail.com> | 2020-05-05 16:13:53 +0200 |
| commit | f19cf27c2b9ff92e2c0fd931ef7fde39c376adaa (patch) | |
| tree | 6d4805a1c7496e3e1e7c55084b84bd7ece348805 /guix | |
| parent | f8fd1157174fd523d36dcfa756c965a54c30d5ae (diff) | |
| download | patches-f19cf27c2b9ff92e2c0fd931ef7fde39c376adaa.tar patches-f19cf27c2b9ff92e2c0fd931ef7fde39c376adaa.tar.gz | |
image: Add a new API.
Raw disk-images and ISO9660 images are created in a Qemu virtual machine. This
is quite fragile, very slow, and almost unusable without KVM.
For all these reasons, add support for host image generation. This implies the
use new image generation mechanisms.
- Raw disk images: images of partitions are created using tools such as mke2fs
and mkdosfs depending on the partition file-system type. The partition
images are then assembled into a final image using genimage.
- ISO9660 images: the ISO root directory is populated within the store. GNU
xorriso is then called on that directory, in the exact same way as this is
done in (gnu build vm) module.
Those mechanisms are built upon the new (gnu image) module.
* gnu/image.scm: New file.
* gnu/system/image.scm: New file.
* gnu/build/image: New file.
* gnu/local.mk: Add them.
* gnu/system/vm.scm (system-disk-image): Rename to system-disk-image-in-vm.
* gnu/ci.scm (qemu-jobs): Adapt to new API.
* gnu/tests/install.scm (run-install): Ditto.
* guix/scripts/system.scm (system-derivation-for-action): Ditto.
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/scripts/system.scm | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 2664c66a30..3c8691a08c 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -54,9 +54,11 @@ #:autoload (gnu build linux-modules) (device-module-aliases matching-modules) #:use-module (gnu system linux-initrd) + #:use-module (gnu image) #:use-module (gnu system) #:use-module (gnu bootloader) #:use-module (gnu system file-systems) + #:use-module (gnu system image) #:use-module (gnu system mapped-devices) #:use-module (gnu system linux-container) #:use-module (gnu system uuid) @@ -692,12 +694,11 @@ checking this by themselves in their 'check' procedure." (* 70 (expt 2 20))) #:mappings mappings)) ((disk-image) - (system-disk-image os - #:name (match file-system-type - ("iso9660" "image.iso") - (_ "disk-image")) - #:disk-image-size image-size - #:file-system-type file-system-type)) + (system-image + (image + (inherit (find-image file-system-type)) + (size image-size) + (operating-system os)))) ((docker-image) (system-docker-image os)))) |