diff options
author | Rutherther <rutherther@ditigal.xyz> | 2025-04-30 18:54:00 +0200 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2025-05-16 17:01:12 +0900 |
commit | f29c25ad7861a4c390c17708ffda6debeeb489de (patch) | |
tree | 35ad377e48601cd9d97a6a1cef61ba4971e9bc50 | |
parent | efcf1a233410797e092a3b413269575fd1b04afd (diff) | |
download | guix-f29c25ad7861a4c390c17708ffda6debeeb489de.tar.gz guix-f29c25ad7861a4c390c17708ffda6debeeb489de.zip |
gnu: /etc/qemu/firmware: Produce only /etc/qemu/firmware instead of /etc/qemu
The service unnecessarily populates /etc/qemu with a symlink, so it's not
possible to write files like /etc/qemu/bridge.conf or /etc/qemu/host.conf
anymore. Since etc-service-type uses file-union, it's possible to put files in
subdirectories. This restores the behavior suggested by manual where user can
extend etc-service-type with qemu/host.conf etc.
* gnu/services/virtualization.scm (/etc/qemu/firmware): Extend with
qemu/firmware instead of qemu
Change-Id: I7c1ea790e5abf7ad05dce56b7901ac6eb90208fd
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
-rw-r--r-- | gnu/services/virtualization.scm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm index b1e7fbb68b..14007e740d 100644 --- a/gnu/services/virtualization.scm +++ b/gnu/services/virtualization.scm @@ -508,14 +508,13 @@ avoid potential infinite waits blocking libvirt.")) (define (/etc/qemu/firmware config) (let ((firmwares (libvirt-configuration-firmwares config))) - `(("qemu" + `(("qemu/firmware" ,(computed-file "etc-qemu-firmware" (with-imported-modules '((guix build union)) #~(begin (use-modules (guix build union) (srfi srfi-26)) - (mkdir #$output) - (union-build (string-append #$output "/firmware") + (union-build #$output (map (cut string-append <> "/share/qemu/firmware") (list #$@firmwares)))))))))) |