ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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).
This commit is contained in:
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 @@ (define-module (gnu services virtualization)
#: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 @@ (define-record-type* <hurd-vm-configuration>
(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."