[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/13: services: hurd-vm: Check whether /dev/kvm exists at run time.
From: |
guix-commits |
Subject: |
04/13: services: hurd-vm: Check whether /dev/kvm exists at run time. |
Date: |
Tue, 29 Sep 2020 16:06:11 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 8ac318068b22b34fbee9980e607020f45a5b549e
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sat Sep 26 22:45:01 2020 +0200
services: hurd-vm: Check whether /dev/kvm exists at run time.
This change allows a childhurd to run within Guix System in a VM.
* gnu/services/virtualization.scm (hurd-vm-shepherd-service)[vm-command]:
Stage the 'file-exists?' call.
---
gnu/services/virtualization.scm | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm
index d184eea..b84203a 100644
--- a/gnu/services/virtualization.scm
+++ b/gnu/services/virtualization.scm
@@ -937,13 +937,14 @@ is added to the OS specified in CONFIG."
(provisions '(hurd-vm childhurd)))
(define vm-command
- #~(list
- (string-append #$qemu "/bin/qemu-system-i386")
- #$@(if (file-exists? "/dev/kvm") '("--enable-kvm") '())
- "-m" (number->string #$memory-size)
- #$@net-options
- #$@options
- "--hda" #+image))
+ #~(append (list #$(file-append qemu "/bin/qemu-system-i386")
+ "-m" (number->string #$memory-size)
+ #$@net-options
+ #$@options
+ "--hda" #+image)
+ (if (file-exists? "/dev/kvm")
+ '("--enable-kvm")
+ '())))
(list
(shepherd-service
- branch master updated (ac324be -> c11c19b), guix-commits, 2020/09/29
- 01/13: services: hurd-vm: Run QEMU as an unprivileged user., guix-commits, 2020/09/29
- 02/13: services: childhurd: Tweak description., guix-commits, 2020/09/29
- 03/13: secret-service: Clarify the origin of messages., guix-commits, 2020/09/29
- 07/13: services: hurd-vm: Pass "-no-reboot" when spawning the Hurd VM., guix-commits, 2020/09/29
- 04/13: services: hurd-vm: Check whether /dev/kvm exists at run time.,
guix-commits <=
- 05/13: services: guix: Generate key pair if needed during activation., guix-commits, 2020/09/29
- 06/13: services: hurd-vm: Initialize the guest's SSH/Guix keys at activation time., guix-commits, 2020/09/29
- 08/13: secret-service: Add a timeout when waiting for a client., guix-commits, 2020/09/29
- 10/13: services: secret-service: Move instance last in the list of services., guix-commits, 2020/09/29
- 13/13: services: hurd-vm: Add system test., guix-commits, 2020/09/29
- 11/13: services: secret-service: Add initial client/server handshake., guix-commits, 2020/09/29
- 09/13: secret-service: Fix file port leak in 'secret-service-send-secrets'., guix-commits, 2020/09/29
- 12/13: secret-service: Add proper logging procedure and log to syslog., guix-commits, 2020/09/29