From patchwork Fri May 9 07:36:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 42477 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 3C88527BC49; Fri, 9 May 2025 08:38:28 +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=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 4631B27BC4A for ; Fri, 9 May 2025 08:38:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uDIJ5-0003MU-FY; Fri, 09 May 2025 03:38:08 -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 1uDIJ1-0003M3-Rr for guix-patches@gnu.org; Fri, 09 May 2025 03:38: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 1uDIJ0-0005xG-QS for guix-patches@gnu.org; Fri, 09 May 2025 03:38: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=Rc/AxCfq7+Y59eOdGDRvNZzyiUmTjPym9Arcqhlix9g=; b=C0g1AKk4nGH7krv+pBMP4obo2UigZRWDnc60neIIM+vQi5CNoAPKT66UR/0n/iDHFH0O5DUIWVF9BdJGuN9PYnjZF6lkZEVfgPazjrX8VuSdA45bOWx3vu7tC/BIcRVThNq/1IJAcAgtqC7j5M3jkVlvTIdKUpOMEtVJ1cQqKeMRndQVyzXU2We7JS57ilYNqZ83wbbBJu7a2dpOwY2cu5QccHT2KbiVgO0W83Mb8GVwng0mPL/7dMzsIlII0KEGdZ/pi9yWLVeqOUq7uTDaCs74JeLy5n8/xM85SQ3QnGWfjnCHFCpqMwHNT9XWwEd3ZGOovZNQANCHGXpMfrGq8g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uDIJ0-0002ON-Eo; Fri, 09 May 2025 03:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78330] [PATCH] services: dnsmasq: Install dbus config. Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 09 May 2025 07:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78330 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78330@debbugs.gnu.org Cc: Sergey Trofimov , Sharlatan Hellseher X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Sharlatan Hellseher Received: via spool by submit@debbugs.gnu.org id=B.17467762299112 (code B ref -1); Fri, 09 May 2025 07:38:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 May 2025 07:37:09 +0000 Received: from localhost ([127.0.0.1]:35072 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uDII9-0002Mu-AN for submit@debbugs.gnu.org; Fri, 09 May 2025 03:37:09 -0400 Received: from lists.gnu.org ([2001:470:142::17]:54122) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uDII5-0002MF-D0 for submit@debbugs.gnu.org; Fri, 09 May 2025 03:37:06 -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 1uDIHy-000365-SL for guix-patches@gnu.org; Fri, 09 May 2025 03:36:59 -0400 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uDIHx-0005o1-4W for guix-patches@gnu.org; Fri, 09 May 2025 03:36:58 -0400 Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-ac289147833so362088366b.2 for ; Fri, 09 May 2025 00:36:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1746776212; x=1747381012; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Rc/AxCfq7+Y59eOdGDRvNZzyiUmTjPym9Arcqhlix9g=; b=Jq1sVrfYeIyiLYWK2rzkDCrz9UVxKGR0FwDXhkKVzmbNg9BuASwx9cZ+CNmAb62u4H 0awwj4Z+JdVRb6YQYqmBdUnANeEu3mLr2bR0ZmJDlGpPORPfmiD67SDKQmd3rwKwCooB 1AjIPtNGHGjFPdk8HlU/i4eL6UHK86PBO9C4da9TOZKNnZueggL79Fqow6mfl7faRnfM XQO+NMrWacqhY13l797NWSb2YZ2uJJvfmiR2h5ozIm4q8nHoN+TmluM8hZoCDplO5s3O 7NClmHUzYW/j3vvICZwoAeNArxDSG7e/gKQMF4Kpir2kje9pnaE7QLynKnUy9hGdz8jB I39A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746776212; x=1747381012; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Rc/AxCfq7+Y59eOdGDRvNZzyiUmTjPym9Arcqhlix9g=; b=rvYS0QnVPnWJD8DCwJ77NM0iA7+ktZXAyplfzSkjzTT8VCu3ACA0IdzQGTwuqUzBTg mh9u62eaO1GdDTOBknEGQlCwFwWC8fGYpUSNpxDIF0duFiWLEnMm6v1gz7E0d1ot+5bZ fOunyHO6R11sjaK9XxY4bMF6f1Q0utjdPE5C7+51lqayC9qWniWpRkbritKWzda9/d/j Y3IPnXWuXRngX+j+vgNMg8VlPBgclsBK5hAUtSODtoMl+oZXyF3V7i5rhalPBIgpXRWj Fn+O48Uqw9VslcxN8VwV5THKEIgag1rBjCZb5h/uUZn2b+sM9QgUc35ZwnFMKzKvMix1 VuSg== X-Gm-Message-State: AOJu0Yxu+5NZEK/Ga2AoeacKbtwo3EngdlANKOFTzBXR2swcwdxhY0Bl MKv/3P3aQi1xoy7ar2BULS/la6FflK7zklt2x/Lwve5bBQ/0idwl5baLuf2L9Oe8FOfd1b5NMGv E7DmgMw== X-Gm-Gg: ASbGncv8R26T/oRghl5GSDzoVf7IeFcDO3+xQYvYDWx7IeWTjoe+pHiY5R7rF2euCOK igvYZKa5KKKR3Y0ubgffOkqH2OHznXe2QOLrU+XHHie3XTFTc+pNPuQWSSSAAapZfUU5TJsY1Yd rHDgNpHmeKMeV23I2/yLYL6ShgkszGKjU2AVpGz/RBLP3UJVTTN+5uq9zxBITBS6qI0mlyLXSjB q2OVIJvwdM5APYiLfIusUa//k6rV3goUQlwt8QZnj31Cu6o1FpX4xV59eRxk+RSHD0J9ShMqwqc M4ooYx4mlMoWoaupQyO8ZWbVZ5mQKqjwBair1w== X-Google-Smtp-Source: AGHT+IGVbAftds4ak0OCa1rEqQB570dOceD0fzytPtGQORdTERS/BKH9CPyrHEcjQPfAdoMcBTasCw== X-Received: by 2002:a17:907:7ea5:b0:acb:baff:fd5f with SMTP id a640c23a62f3a-ad218f8e9a4mr204267666b.35.1746776211878; Fri, 09 May 2025 00:36:51 -0700 (PDT) Received: from localhost ([2a02:2454:a095:5600:a64e:31ff:fe38:fd6c]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ad2197bd40asm109640166b.149.2025.05.09.00.36.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 May 2025 00:36:51 -0700 (PDT) From: Sergey Trofimov Date: Fri, 9 May 2025 09:36:47 +0200 Message-ID: <87b29cc0362cf515bcdb6e13d59505f71c762fdf.1746776080.git.sarg@sarg.org.ru> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62d; envelope-from=sarg@sarg.org.ru; helo=mail-ej1-x62d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: , 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 While DBUS service is enabled in dnsmasq, it does not work without installing a config file to the system. * gnu/packages/dns.scm (dnsmasq): Install dbus config. * gnu/services/dns.scm (dnsmasq): Extend dbus-root-service-type. Change-Id: I5187f65e1f2892eb10fb95e6f51955559f64dbef --- gnu/packages/dns.scm | 8 +++++++- gnu/services/dns.scm | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) base-commit: 2e1ead7c8b449b58d571d8f16c1586b675c13ab4 diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 3d780019a0..af25ef7370 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -310,7 +310,13 @@ (define-public dnsmasq (list dbus)) (arguments `(#:phases - (modify-phases %standard-phases (delete 'configure)) + (modify-phases %standard-phases + (delete 'configure) + (add-after 'install 'install-dbus + (lambda _ + (install-file "dbus/dnsmasq.conf" + (string-append %output "/etc/dbus-1/system.d"))))) + #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) (string-append "CC=" ,(cc-for-target)) (string-append "PKG_CONFIG=" ,(pkg-config-for-target)) diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm index 05291eb65d..1c9c8fcfe4 100644 --- a/gnu/services/dns.scm +++ b/gnu/services/dns.scm @@ -23,6 +23,7 @@ (define-module (gnu services dns) #:use-module (gnu services) #:use-module (gnu services configuration) + #:use-module (gnu services dbus) #:use-module (gnu services shepherd) #:use-module (gnu system shadow) #:use-module (gnu packages admin) @@ -909,6 +910,8 @@ (define dnsmasq-service-type (extensions (list (service-extension shepherd-root-service-type (compose list dnsmasq-shepherd-service)) + (service-extension dbus-root-service-type + (compose list dnsmasq-configuration-package)) (service-extension activation-service-type dnsmasq-activation))) (default-value (dnsmasq-configuration))