From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id 0AsjAcKpMmaoQwAAqHPOHw:P1 (envelope-from ) for ; Wed, 01 May 2024 22:44:50 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id 0AsjAcKpMmaoQwAAqHPOHw (envelope-from ) for ; Wed, 01 May 2024 22:44:50 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=sarg.org.ru header.s=google header.b=Yo5JZZqJ; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1714596290; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=IlO1DQBN4PIYuDOq4BG2CRWah/s9lFDhsbS7ruHIo1s=; b=KEHEh+wR/skpvVBRusR+51+LPq4MPdVfGxkvqB71xLssVdzVCLn41EH03acZGeVrD8vFb6 qGDWh1tCHy2eoT/1gGwX+jeJs7YwnKq5IWQwNpU2AJAFOZJlFRfXy2g3gUSJySCWHszDgl BZNI6LCNZICHIxX768BG35lhXJTibK+f6pqNQM/cGN5K3p7PaBmGYQiXfJvCWAayddsRa9 1nWqjfVW6OP5+FPAY0tzvl6dU50env5z9Y2advdFQbwXD70zTHK0+sxaQtsL3r1k6lEdXa +H6wZ8nBzLPva26Ip0x6wsjz/Rr19axbxy999O84+HaNBl9xFF7qZARNExQ22A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=sarg.org.ru header.s=google header.b=Yo5JZZqJ; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1714596290; a=rsa-sha256; cv=none; b=L5Kqt4z83WEEiEJSB2stUGqmtpZ4F5edRy7mZi/C+t+7u4lr+LN+ZKFleQI+ROhefA7KJB lw9RihabN2B3XcAZPoYo2bEc4mwV5I+PvEkcNji6ZETX9YMuud2EBbRfC9N04AstO+7l69 FlrYKJSUqHH+dTJ6DUl44xhj7kKiWThfrll5zNptDGHf3S1kxp8DadlaZsnbz8M/txS8cv uYT5J50N+qs/4QLGD6+EBQiCeKh94q53gxmnlSIuuQxxwmFgVyJeL/nIG1S4F7KumKYqLP +Udxs1yZ81DMKqS+Tp91xEGYRMSUEm8kz3vArxp9KZvuEWZICzirLooq0dDLfg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 28C135288C for ; Wed, 1 May 2024 22:44:49 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s2Gon-0002nA-9w; Wed, 01 May 2024 16:44:45 -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 1s2Goj-0002mt-9m for guix-patches@gnu.org; Wed, 01 May 2024 16:44:41 -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 1s2Goi-0000sD-ML for guix-patches@gnu.org; Wed, 01 May 2024 16:44:41 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s2Gp4-0006Jy-1N for guix-patches@gnu.org; Wed, 01 May 2024 16:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70706] [PATCH] gnu: services: dns: Escape hatch for dnsmasq-configuration. Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 May 2024 20:45:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70706 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70706@debbugs.gnu.org Cc: Sergey Trofimov X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171459624824217 (code B ref -1); Wed, 01 May 2024 20:45:01 +0000 Received: (at submit) by debbugs.gnu.org; 1 May 2024 20:44:08 +0000 Received: from localhost ([127.0.0.1]:39352 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s2GoC-0006IX-E5 for submit@debbugs.gnu.org; Wed, 01 May 2024 16:44:08 -0400 Received: from lists.gnu.org ([2001:470:142::17]:52878) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s2GoB-0006IR-01 for submit@debbugs.gnu.org; Wed, 01 May 2024 16:44:07 -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 1s2Gnj-00024E-Mn for guix-patches@gnu.org; Wed, 01 May 2024 16:43:40 -0400 Received: from mail-lf1-x12e.google.com ([2a00:1450:4864:20::12e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s2Gng-0000U2-Th for guix-patches@gnu.org; Wed, 01 May 2024 16:43:39 -0400 Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-51ef64d04b3so798537e87.3 for ; Wed, 01 May 2024 13:43:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1714596214; x=1715201014; 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=IlO1DQBN4PIYuDOq4BG2CRWah/s9lFDhsbS7ruHIo1s=; b=Yo5JZZqJTZwJ5bh0aq95vUP9yIUCK8SGa5aj8ulyo8oLyrXxlPoElb2j2ZcwY2vIls 6tJ/ECk+BiFVKpsSCYc1d/2XAY44k1omJjy0jk+ZmKAUI/Pyohkq7UvA2gmhl2qA/0Uu W8tk2IX2TTTsCGoNTH+7UIRbea46K2AcGL/Sc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714596214; x=1715201014; 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=IlO1DQBN4PIYuDOq4BG2CRWah/s9lFDhsbS7ruHIo1s=; b=JlkkFYRGc8ytWyMd9G0dTNM1n3ngm58Yc0B3nN4CymKgvWy2x6c6QbWwwY2eOPQuzm MVpfMozTw8eYeAe8IHXMWWDYBL6gLDfQI4gZORYCqr4ru02tAweFB4d74FgT1YwnvDoc CnbBH9dSKNX2kkH/3eU9SH1gaZLXGJC9c7uYPsl13hBIY0uosET8AFJbXE0Cx9NXgLCo D8jmws3gELqc5CR2uXo6b8sr17KRsC019IIQlxlBRc3iQ1K3JfUQwOZs9nvl84uQjab1 2PRcGKjrAhIXitIqJI+nBnrquVMqLUZ31TN1NVuHzMoOESgnqYcvQVUZWLJihgrJGP64 j2Ww== X-Gm-Message-State: AOJu0YyXl64ClyQPmTXzcHit76jh4mqgDK2K7tCNKmLb9bBxfvvC9AO1 MLdO0PW6QMGVMfMoxo9+NrdB/QCCiPWNtq8bTdObMcQU7Min3U6QYbpJZIJdxBA/Dyr1i0X7hBJ 1S5E= X-Google-Smtp-Source: AGHT+IE4htW1IpBXSUMbQx7FLrz/DKxPk/6ovCpl7hND0loiGofCsGgGrxnVmOKfJHXR16nHhVzQiQ== X-Received: by 2002:a05:6512:2815:b0:51d:d630:365c with SMTP id cf21-20020a056512281500b0051dd630365cmr3199111lfb.4.1714596214240; Wed, 01 May 2024 13:43:34 -0700 (PDT) Received: from localhost ([2a02:2454:a09d:d000:a64e:31ff:fe38:fd6c]) by smtp.gmail.com with ESMTPSA id i21-20020a170906091500b00a5216df5d25sm16619732ejd.3.2024.05.01.13.43.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 May 2024 13:43:33 -0700 (PDT) From: Sergey Trofimov Date: Wed, 1 May 2024 22:43:31 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: none client-ip=2a00:1450:4864:20::12e; envelope-from=sarg@sarg.org.ru; helo=mail-lf1-x12e.google.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 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_NONE=0.001, URIBL_SBL_A=0.1 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -0.89 X-Spam-Score: -0.89 X-Migadu-Queue-Id: 28C135288C X-Migadu-Scanner: mx13.migadu.com X-TUID: EgiwgsO1BI1n * gnu/service/dns.scm: ()[extra-options]: Add. * doc/guix.texi: Document ()[extra-options]. --- doc/guix.texi | 4 ++++ gnu/services/dns.scm | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 749d689ac1..17798becd5 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -33498,6 +33498,10 @@ DNS Services resolving MAC addresses is only possible if the client is in the local network or obtained a DHCP lease from dnsmasq. +@item @code{extra-options} (default: @code{'()}) +This option provides an ``escape hatch'' for the user to provide arbitrary +command-line arguments to @command{dnsmasq} as a list of strings. + @end table @end deftp diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm index 6608046909..043c34599c 100644 --- a/gnu/services/dns.scm +++ b/gnu/services/dns.scm @@ -739,6 +739,8 @@ (define-record-type* (default #t)) ;boolean (listen-addresses dnsmasq-configuration-listen-address (default '())) ;list of string + (extra-options dnsmasq-configuration-extra-options + (default '())) ;list of string (resolv-file dnsmasq-configuration-resolv-file (default "/etc/resolv.conf")) ;string (no-resolv? dnsmasq-configuration-no-resolv? @@ -798,7 +800,7 @@ (define (dnsmasq-shepherd-service config) tftp-single-port? tftp-secure? tftp-max tftp-mtu tftp-no-blocksize? tftp-lowercase? tftp-port-range - tftp-root tftp-unique-root) + tftp-root tftp-unique-root extra-options) (shepherd-service (provision '(dnsmasq)) (requirement '(networking)) @@ -877,7 +879,8 @@ (define (dnsmasq-shepherd-service config) (if (> (length tftp-unique-root) 0) (format #f "--tftp-unique-root=~a" tftp-unique-root) (format #f "--tftp-unique-root"))) - '())) + '()) + #$@extra-options) #:pid-file "/run/dnsmasq.pid")) (stop #~(make-kill-destructor))))) base-commit: 5c13ab50b9c7d44238c64e5337027f04ae1d9223 -- 2.41.0