GNU bug report logs - #78165
[PATCH] gnu: /etc/qemu/firmware: Produce only /etc/qemu/firmware instead of /etc/qemu

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 78165 in the body.
You can then email your comments to 78165 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Rutherther <rutherther <at> ditigal.xyz>
To: guix-patches <at> gnu.org
Cc: Rutherther <rutherther <at> ditigal.xyz>
Subject: [PATCH] gnu: /etc/qemu/firmware: Produce only /etc/qemu/firmware
 instead of /etc/qemu
Date: Wed, 30 Apr 2025 18:54:00 +0200

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
---
 gnu/services/virtualization.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm
index 0836fe7d45..081093eab3 100644
--- a/gnu/services/virtualization.scm
+++ b/gnu/services/virtualization.scm
@@ -577,14 +577,13 @@ (define (libvirt-shepherd-service config)
 
 (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))))))))))
 

base-commit: 8a9f0a618e929289d8d13e9341349ca7fdd06d99
-- 
2.49.0

Message #10 received at 78165-done <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Rutherther <rutherther <at> ditigal.xyz>
Cc: Efraim Flashner <efraim <at> flashner.co.il>, 78165-done <at> debbugs.gnu.org
Subject: Re: [bug#78165] [PATCH] gnu: /etc/qemu/firmware: Produce only
 /etc/qemu/firmware instead of /etc/qemu
Date: Fri, 16 May 2025 22:04:34 +0900

Hi,

Rutherther <rutherther <at> ditigal.xyz> writes:

> 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

Good idea!  Pushed.

-- 
Thanks,
Maxim

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.