[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/06: services: hurd-vm: Avoid circular dependency with (gnu system ima
From: |
guix-commits |
Subject: |
04/06: services: hurd-vm: Avoid circular dependency with (gnu system images hurd). |
Date: |
Mon, 7 Dec 2020 06:49:53 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 859b362f81598830d7ff276b96a8724aee3c4db7
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Dec 7 12:38:25 2020 +0100
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).
---
gnu/services/virtualization.scm | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm
index eaf0bbd..f435630 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."
- branch master updated (27cf238 -> d8ae785), guix-commits, 2020/12/07
- 02/06: profiles: Remove duplicates in manifest transactions., guix-commits, 2020/12/07
- 04/06: services: hurd-vm: Avoid circular dependency with (gnu system images hurd).,
guix-commits <=
- 05/06: services: openssh: Warn about 'password-authentication?' default., guix-commits, 2020/12/07
- 01/06: doc: Fix incorrect GUIX_PROFILE value for 'guix pull'., guix-commits, 2020/12/07
- 03/06: profiles: Delete duplicate manifest entries in packages->manifest., guix-commits, 2020/12/07
- 06/06: tests: lint: Add origin patch file name test cases., guix-commits, 2020/12/07