From patchwork Wed Apr 30 16:54:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rutherther X-Patchwork-Id: 42191 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E920B27BC4B; Wed, 30 Apr 2025 19:58:32 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6570C27BC49 for ; Wed, 30 Apr 2025 19:58:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uACdB-0006AH-PU; Wed, 30 Apr 2025 14:58:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uACd9-00069y-Vf for guix-patches@gnu.org; Wed, 30 Apr 2025 14:58:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uACd9-00012G-FW for guix-patches@gnu.org; Wed, 30 Apr 2025 14:58:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=XG9dLhxctcXXijCLEcDF4rejjuDirWx+yW7+KnOoXRU=; b=pSXsUYQMYXHjvi+lzu3P9w8wY2PgeJi9cRr69J74LT8zNC2km8luqBWOYyuKppQ05trU+8NujWexBY64vaZNefIDFDSYqOLJo6fz8qQZkI9t81Tz9PgoRbXQYnIRZMqLwAlBOBnGdBQpEiyAZKIq1dEjaTo4Oysks9ozILADWgXI4Sn0gV2Sl92f25RoV84DYQa0PVr5fDnJlk/HFtcObtDJ55lkUIGojUJiq2C8/yKuqvMLZ/FCvP8ffd6DgZqEpl3rmCD/3bo1Soy3hFqpUynNQZLYK6pqvLhqAIy0RbmqO96/+tpRluhxa5oGG9FdYYfww2S7iZx6XVyzMw5vHg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uACd8-000376-Du; Wed, 30 Apr 2025 14:58:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78165] [PATCH] gnu: /etc/qemu/firmware: Produce only /etc/qemu/firmware instead of /etc/qemu Resent-From: Rutherther Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 30 Apr 2025 18:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78165 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78165@debbugs.gnu.org Cc: Rutherther , Efraim Flashner , Maxim Cournoyer X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Efraim Flashner , Maxim Cournoyer Received: via spool by submit@debbugs.gnu.org id=B.174603942911717 (code B ref -1); Wed, 30 Apr 2025 18:58:02 +0000 Received: (at submit) by debbugs.gnu.org; 30 Apr 2025 18:57:09 +0000 Received: from localhost ([127.0.0.1]:56900 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uACcG-00032s-FC for submit@debbugs.gnu.org; Wed, 30 Apr 2025 14:57:08 -0400 Received: from lists.gnu.org ([2001:470:142::17]:36402) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uACcD-00031z-Fb for submit@debbugs.gnu.org; Wed, 30 Apr 2025 14:57:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uAAie-0000U4-0T for guix-patches@gnu.org; Wed, 30 Apr 2025 12:55:36 -0400 Received: from ditigal.xyz ([2a01:4f8:1c1b:6a1c::] helo=mail.ditigal.xyz) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1uAAib-0002pW-P5 for guix-patches@gnu.org; Wed, 30 Apr 2025 12:55:35 -0400 Received: by cerebrum (OpenSMTPD) with ESMTPSA id 5133a1da (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Wed, 30 Apr 2025 16:55:28 +0000 (UTC) Date: Wed, 30 Apr 2025 18:54:00 +0200 Message-ID: <0dbb359fe647517ad0d7cc40de6c4e644e32f004.1746032004.git.rutherther@ditigal.xyz> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ditigal.xyz; i=@ditigal.xyz; q=dns/txt; s=20240917; t=1746032128; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : from; bh=STlpq4rjASKhw3PT9rq4UHK/UP3xqJT+Vctj5BrQ/b4=; b=SNoBuJRwl7NdbcitHuzpTiT+nx8jjg7ZbdBiUNRM4l6mD7S6VCu3iZW+REaHcAx4RgRRZ n3N7mjMBCDLzNHXXtuODsVG9fvdggJNjHm7ur3bO6iijXAKdeTWLlgycZ+x/g3aQBg/JO6/ 6fUtV/mDyXBtSG1TUbjY/FeKb6OShIo= Received-SPF: pass client-ip=2a01:4f8:1c1b:6a1c::; envelope-from=rutherther@ditigal.xyz; helo=mail.ditigal.xyz X-Spam_score_int: 4 X-Spam_score: 0.4 X-Spam_bar: / X-Spam_report: (0.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FROM_SUSPICIOUS_NTLD=0.498, FROM_SUSPICIOUS_NTLD_FP=1.997, PDS_OTHER_BAD_TLD=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Rutherther X-ACL-Warn: , Rutherther via Guix-patches X-Patchwork-Original-From: Rutherther via Guix-patches via From: Rutherther Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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(-) base-commit: 8a9f0a618e929289d8d13e9341349ca7fdd06d99 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))))))))))