diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-05-05 20:43:21 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-05-05 20:43:21 +0200 |
| commit | 87a40d7203a813921b3ef0805c2b46c0026d6c31 (patch) | |
| tree | cebad70c1df30969005c18c4d9faa39d7d80cbf6 /guix/scripts | |
| parent | ba151b7e1a9cc0baf932b5c5e0c916e54d2e27f4 (diff) | |
| parent | 751d1f01e4f0607d41e4c859d944753b18466652 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/scripts')
| -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)))) |