tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00
Code Activity

gnu: libvirt: Configure default libvirt network.

Browse Source 
* gnu/services/virtualization.scm (%libvirt-activation): Activate
default libvirt network configuration file.
* gnu/tests/virtualization.scm (run-libvirt-test): Drop network
definition test and replace it with a test checking that the default
network is inactive by default.

Change-Id: I03b6314a390c6d93ebf886d7033867ff5cacad74
This commit is contained in:
Giacomo Leidi
2026-02-17 11:46:46 +01:00
parent e29c17a2e7
commit a375202ad3
2 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/services/virtualization.scm
View File

@@ -9,6 +9,7 @@
;;; Copyright © 2024 Raven Hallsby <karl@hallsby.com>
;;; Copyright © 2025 Maxim Cournoyer <maxim@guixotic.coop>
;;; Copyright © 2025 Nigko Yerden <nigko.yerden@gmail.com>
;;; Copyright © 2026 Giacomo Leidi <therewasa@fishinthecalculator.me>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -493,10 +494,21 @@ avoid potential infinite waits blocking libvirt."))
(list (user-group (name "libvirt") (system? #t))))
(define (%libvirt-activation config)
(let ((sock-dir (libvirt-configuration-unix-sock-dir config)))
(let ((package (libvirt-configuration-libvirt config))
(sock-dir (libvirt-configuration-unix-sock-dir config)))
#~(begin
(use-modules (guix build utils))
(mkdir-p #$sock-dir))))
(mkdir-p #$sock-dir)
(mkdir-p "/etc/libvirt/qemu/networks")
;; special-files-service-type could be used but it creates a file union
;; and libvirtd needs to write in /etc/libvirt. This makes /etc/libvirt
;; read-only and libvirt crashes at startup. activate-special-files
;; creates a single symlink to the store for
;; /etc/libvirt/qemu/networks/default.xml so libvirt doesn't notice and
;; starts successfully.
(activate-special-files
'(("/etc/libvirt/qemu/networks/default.xml"
#$(file-append package "/etc/libvirt/qemu/networks/default.xml")))))))
(define (libvirt-shepherd-service config)
(let* ((config-file (libvirt-conf-file config))

20
gnu/tests/virtualization.scm
View File

@@ -119,15 +119,23 @@
"-c" "qemu:///system" "connect"))
marionette))
(test-eq "create default network"
0
(test-equal "default network is inactive"
"no"
(marionette-eval
'(begin
(use-modules (ice-9 popen)
(ice-9 textual-ports))
(chdir "/tmp")
(system* #$(file-append libvirt "/bin/virsh")
"-c" "qemu:///system" "net-define"
#$(file-append libvirt
"/etc/libvirt/qemu/networks/default.xml")))
(define port
(open-input-pipe
(string-join '(#$(file-append libvirt "/bin/virsh")
"-c" "qemu:///system" "net-info"
"default" "|" "grep" "Active:" "|"
"awk" "'{ print $2; }'")
" ")))
(define answer (get-string-all port))
(close-port port)
(string-trim-both answer))
marionette))
(test-eq "start default network"