diff options
| author | Leo Famulari <leo@famulari.name> | 2021-01-25 15:21:09 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2021-01-25 15:40:55 -0500 |
| commit | 68dd78e2e47248b3e1e7ba1807a92a8374b39097 (patch) | |
| tree | d38564293f285d688a55b23e8a6424c6b26213b1 /gnu/services/virtualization.scm | |
| parent | 8b55544212a90b0276df49596a3d373e5c2e8f5c (diff) | |
| parent | 3f0af15131e524891df8c9f013f1be1597fe2d7e (diff) | |
| download | guix-patches-68dd78e2e47248b3e1e7ba1807a92a8374b39097.tar guix-patches-68dd78e2e47248b3e1e7ba1807a92a8374b39097.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/services/virtualization.scm')
| -rw-r--r-- | gnu/services/virtualization.scm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm index f435630faf..a45da14a80 100644 --- a/gnu/services/virtualization.scm +++ b/gnu/services/virtualization.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Ryan Moe <ryan.moe@gmail.com> ;;; Copyright © 2018, 2020 Ludovic Courtès <ludo@gnu.org> -;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> +;;; Copyright © 2020,2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -717,7 +717,7 @@ potential infinite waits blocking libvirt.")) (platforms qemu-binfmt-configuration-platforms (default '())) ;safest default (guix-support? qemu-binfmt-configuration-guix-support? - (default #f))) + (default #t))) (define (qemu-platform->binfmt qemu platform) "Return a gexp that evaluates to a binfmt string for PLATFORM, using the @@ -917,7 +917,9 @@ is added to the OS specified in CONFIG." (disk-size (hurd-vm-configuration-disk-size config)) (type (lookup-image-type-by-name 'hurd-qcow2)) (os->image (image-type-constructor type))) - (system-image (os->image os)))) + (system-image + (image (inherit (os->image os)) + (size disk-size))))) (define (hurd-vm-port config base) "Return the forwarded vm port for this childhurd config." |