me
/
guix
Archived
1
0
Fork 0
Code

services: hurd-vm: Avoid circular dependency with (gnu system images hurd). 

* gnu/services/virtualization.scm (hurd-vm-disk-image): Use
'lookup-image-type-by-name' instead of referring to 'hurd-disk-image'
from (gnu system images hurd).
master
Ludovic Courtès 2020-12-07 12:38:25 +01:00
parent 07340cbebc
commit 859b362f81
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/services/virtualization.scm
View File

@ -36,7 +36,6 @@
#:use-module (gnu system file-systems) #:use-module (gnu system file-systems)
#:use-module (gnu system hurd) #:use-module (gnu system hurd)
#:use-module (gnu system image) #:use-module (gnu system image)
#:use-module (gnu system images hurd)
#:use-module (gnu system shadow) #:use-module (gnu system shadow)
#:use-module (gnu system) #:use-module (gnu system)
#:use-module (guix derivations) #: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) (define (hurd-vm-disk-image config)
"Return a disk-image for the Hurd according to CONFIG. The secret-service "Return a disk-image for the Hurd according to CONFIG. The secret-service
is added to the OS specified in CONFIG." is added to the OS specified in CONFIG."
(let ((os (secret-service-operating-system (hurd-vm-configuration-os config))) (let* ((os (secret-service-operating-system
(disk-size (hurd-vm-configuration-disk-size config))) (hurd-vm-configuration-os config)))
(system-image (disk-size (hurd-vm-configuration-disk-size config))
(image (type (lookup-image-type-by-name 'hurd-qcow2))
(inherit hurd-disk-image) (os->image (image-type-constructor type)))
(format 'compressed-qcow2) (system-image (os->image os))))
(size disk-size)
(operating-system os)))))
(define (hurd-vm-port config base) (define (hurd-vm-port config base)
"Return the forwarded vm port for this childhurd config." "Return the forwarded vm port for this childhurd config."