diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-13 23:39:52 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-13 23:45:53 -0500 |
| commit | 01f0707207741ce2a5d7509a175464799b08aea6 (patch) | |
| tree | 08e8f4da56f26363c3b53e0442a21b286b55e0e5 /gnu/services/virtualization.scm | |
| parent | 734bcf13139119daf8685f93b056c3422dbfa264 (diff) | |
| parent | 6985a1acb3e9cc4cad8b6f63d77154842d25c929 (diff) | |
| download | guix-patches-01f0707207741ce2a5d7509a175464799b08aea6.tar guix-patches-01f0707207741ce2a5d7509a175464799b08aea6.tar.gz | |
Merge branch 'staging' into 'core-updates'.
Conflicts:
gnu/local.mk
gnu/packages/cmake.scm
gnu/packages/curl.scm
gnu/packages/gl.scm
gnu/packages/glib.scm
gnu/packages/guile.scm
gnu/packages/node.scm
gnu/packages/openldap.scm
gnu/packages/package-management.scm
gnu/packages/python-xyz.scm
gnu/packages/python.scm
gnu/packages/tls.scm
gnu/packages/vpn.scm
gnu/packages/xorg.scm
Diffstat (limited to 'gnu/services/virtualization.scm')
| -rw-r--r-- | gnu/services/virtualization.scm | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm index eaf0bbde43..f435630faf 100644 --- a/gnu/services/virtualization.scm +++ b/gnu/services/virtualization.scm @@ -36,7 +36,6 @@ #:use-module (gnu system file-systems) #:use-module (gnu system hurd) #:use-module (gnu system image) - #:use-module (gnu system images hurd) #:use-module (gnu system shadow) #:use-module (gnu system) #:use-module (guix derivations) @@ -913,14 +912,12 @@ that will be listening to receive secret keys on port 1004, TCP." (define (hurd-vm-disk-image config) "Return a disk-image for the Hurd according to CONFIG. The secret-service is added to the OS specified in CONFIG." - (let ((os (secret-service-operating-system (hurd-vm-configuration-os config))) - (disk-size (hurd-vm-configuration-disk-size config))) - (system-image - (image - (inherit hurd-disk-image) - (format 'compressed-qcow2) - (size disk-size) - (operating-system os))))) + (let* ((os (secret-service-operating-system + (hurd-vm-configuration-os 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)))) (define (hurd-vm-port config base) "Return the forwarded vm port for this childhurd config." |