From patchwork Thu May 8 17:47:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Abramov X-Patchwork-Id: 42467 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 0B51127BC4A; Thu, 8 May 2025 18:51:52 +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 70FA027BC49 for ; Thu, 8 May 2025 18:51:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uD5P5-0005Xb-PY; Thu, 08 May 2025 13:51:28 -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 1uD5Ok-0005E3-Cy for guix-patches@gnu.org; Thu, 08 May 2025 13:51:17 -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 1uD5Oi-0001ut-86; Thu, 08 May 2025 13:51:04 -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:References:In-Reply-To:Date:From:To:Subject; bh=olJTwpuIoqvBCXGacS7xTtQlCYsWtGsVStHUCbbt/HU=; b=QLkHfDDY7uQt843cz6vyQEb7OK2YR0gxNbUpWcVIQDX9r5VR8md6zNKbZqDFBOQhryqPnTJSLnGuy3LbCJFyflx8lJznDPX124pCOUpzsOs+X7NlwjvSujlXf4rU6+EMgJNcLlmxD8FZ1Pb/dGXRq4Vlq8Ig/gqFu2ZQWt06hSMEin/OSSj7R9luUaW0FEko0BBa8YH0qXVaTcGFx/72ueFgMyebsNcm21UG67IIg1zU5ntL0pamgclmNHR0hF5onzNBkIzSIzGzAmtQwMSpGWsrArTg1IZpQod+u2gByQv6Wx/NGjQVqF4+8xZfNG6B0S2d3c8jYXtUiFxXAOM0sw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uD5Og-0007gB-QB; Thu, 08 May 2025 13:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77204] [PATCH v4 1/3] services: dnsmasq: Add shepherd-provision and shepherd-requirement fields. Resent-From: Alexey Abramov Original-Sender: "Debbugs-submit" Resent-CC: gabriel@erlikon.ch, ludo@gnu.org, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Thu, 08 May 2025 17:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77204 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77204@debbugs.gnu.org Cc: Gabriel Wicki , Ludovic =?utf-8?q?Court=C3=A8s?= , Maxim Cournoyer X-Debbugs-Original-Xcc: Gabriel Wicki , Ludovic =?utf-8?q?Court=C3=A8s?= , Maxim Cournoyer Received: via spool by 77204-submit@debbugs.gnu.org id=B77204.174672663529426 (code B ref 77204); Thu, 08 May 2025 17:51:02 +0000 Received: (at 77204) by debbugs.gnu.org; 8 May 2025 17:50:35 +0000 Received: from localhost ([127.0.0.1]:59717 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uD5OE-0007eT-OX for submit@debbugs.gnu.org; Thu, 08 May 2025 13:50:35 -0400 Received: from mail.mmer.org ([178.22.65.174]:51192) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uD5OC-0007dp-26 for 77204@debbugs.gnu.org; Thu, 08 May 2025 13:50:32 -0400 Received: from mail.mmer.org (localhost [127.0.0.1]) by mail.mmer.org (OpenSMTPD) with ESMTP id aca7030e for <77204@debbugs.gnu.org>; Thu, 8 May 2025 17:50:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=mmer.org; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=Wo5E4PKD4t3Oa4TmO6Z44T+Gz Zo2RnDxzewPwgY7rN0=; b=7ci0lpq3khBVGqSrXy1VFiibaytDT5FATZcffJI7T /dPydygRpfeaaDOSnqCY8u33gTUGG6sIzm1ASQMDnby3p3YCEJKFu/o7qUKEVEL1 g8nBokzyQIfBIM4jYxxHvrfX9SNFTjRJU/8B9TfqjOxZAQcz4/2nps8bsee8i28e hk= Received: from delta (208-91-20-31.ftth.glasoperator.nl [31.20.91.208]) by mail.mmer.org (OpenSMTPD) with ESMTPSA id b352b3c6 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <77204@debbugs.gnu.org>; Thu, 8 May 2025 17:50:22 +0000 (UTC) Date: Thu, 8 May 2025 19:47:41 +0200 Message-ID: <50e5cf5522a10bc4f438d33847d01b5e6adfe676.1746726463.git.levenson@mmer.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 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: Alexey Abramov X-ACL-Warn: , Alexey Abramov via Guix-patches X-Patchwork-Original-From: Alexey Abramov via Guix-patches via From: Alexey Abramov 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 * gnu/services/dns.scm ()[provision]: Mark filed as deprecated with a warning. Set default to #f. [shepherd-provision]: Add new field for consistency with other services. [shepherd-requirement]: Add new field. (dnsmasq-shepherd-service): Use them * doc/guix.texi: Document these changes. * doc/guix-cookbook.texi (Custom NAT-based network for libvirt): Update example to use 'shepherd-provision' instead of 'provision'. --- doc/guix-cookbook.texi | 4 ++-- doc/guix.texi | 11 ++++++++--- gnu/services/dns.scm | 24 ++++++++++++++++++++---- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi index fb58866d404..3ebe661a078 100644 --- a/doc/guix-cookbook.texi +++ b/doc/guix-cookbook.texi @@ -4018,8 +4018,8 @@ Custom NAT-based network for libvirt (service dnsmasq-service-type (dnsmasq-configuration ;; You can have multiple instances of `dnsmasq-service-type` as long - ;; as each one has a different provision. - (provision '(dnsmasq-virbr0)) + ;; as each one has a different shepherd-provision. + (shepherd-provision '(dnsmasq-virbr0)) (extra-options (list ;; Only bind to the virtual bridge. This ;; avoids conflicts with other running diff --git a/doc/guix.texi b/doc/guix.texi index 889eab2ab35..279bbda9ac4 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -36086,9 +36086,14 @@ DNS Services @item @code{package} (default: @var{dnsmasq}) Package object of the dnsmasq server. -@item @code{provision} (default: @code{'(dnsmasq)}) -A list of symbols for the Shepherd service corresponding to this dnsmasq -configuration. +@item @code{shepherd-provision} (default: @code{'(dnsmasq)}) +@itemx @code{shepherd-requirement} (default: @code{'(user-processes networking)}) +This option can be used to provide a list of Shepherd service names +(symbols) provided by this service. You might want to change the default +value if you intend to run several @command{dnsmasq} instances. + +Likewise, @code{shepherd-requirement} is a list of Shepherd service names +(symbols) that this service will depend on. @item @code{no-hosts?} (default: @code{#f}) When true, don't read the hostnames in /etc/hosts. diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm index 05291eb65d9..fd849d08e89 100644 --- a/gnu/services/dns.scm +++ b/gnu/services/dns.scm @@ -27,6 +27,7 @@ (define-module (gnu services dns) #:use-module (gnu system shadow) #:use-module (gnu packages admin) #:use-module (gnu packages dns) + #:use-module (guix deprecation) #:use-module (guix packages) #:use-module (guix records) #:use-module (guix gexp) @@ -742,8 +743,13 @@ (define-record-type* dnsmasq-configuration? (package dnsmasq-configuration-package (default dnsmasq)) ;file-like - (provision dnsmasq-provision - (default '(dnsmasq))) + (provision dnsmasq-configuration-provision ; deprecated + (default #f) + (sanitize warn-deprecated-dnsmasq-configuration-provision)) + (shepherd-provision dnsmasq-configuration-shepherd-provision + (default '(dnsmasq))) + (shepherd-requirement dnsmasq-configuration-shepherd-requirement + (default '(user-processes networking))) (no-hosts? dnsmasq-configuration-no-hosts? (default #f)) ;boolean (port dnsmasq-configuration-port @@ -799,9 +805,19 @@ (define-record-type* (tftp-unique-root dnsmasq-tftp-unique-root (default #f))) ;"" or "ip" or "mac" +(define (warn-deprecated-dnsmasq-configuration-provision value) + (when (pair? value) + (warn-about-deprecation + 'provision #f + #:replacement 'shepherd-provision)) + value) + (define (dnsmasq-shepherd-service config) (match-record config (package + provision + shepherd-provision + shepherd-requirement no-hosts? port local-service? listen-addresses resolv-file no-resolv? @@ -815,8 +831,8 @@ (define (dnsmasq-shepherd-service config) tftp-lowercase? tftp-port-range tftp-root tftp-unique-root extra-options) (shepherd-service - (provision (dnsmasq-provision config)) - (requirement '(user-processes networking)) + (provision (or provision shepherd-provision)) + (requirement shepherd-requirement) (documentation "Run the dnsmasq DNS server.") (start #~(make-forkexec-constructor (list