From debbugs-submit-bounces@debbugs.gnu.org Wed May 01 16:44:08 2024 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 To: guix-patches@gnu.org Subject: [PATCH] gnu: services: dns: Escape hatch for dnsmasq-configuration. 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-Spam-Score: 0.7 (/) X-Debbugs-Envelope-To: submit Cc: Sergey Trofimov X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.3 (/) * 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 From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 13 16:43:55 2024 Received: (at 70706-done) by debbugs.gnu.org; 13 Jun 2024 20:43:55 +0000 Received: from localhost ([127.0.0.1]:39324 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sHrIZ-0007g1-3y for submit@debbugs.gnu.org; Thu, 13 Jun 2024 16:43:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53008) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sHrIX-0007fp-3l for 70706-done@debbugs.gnu.org; Thu, 13 Jun 2024 16:43:53 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sHrIQ-0006kz-8q; Thu, 13 Jun 2024 16:43:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=JxjdXRhOkrM3087O9KQRh8dNjnvEi7/jw8eTupyjmBc=; b=l5KyKZtS0NCLBqYhFc6n aLavwSF3JWHsum1MpfjYzhqRgadQIifXeLNPWkCIZseWgAcqmJbBVUr3cfUuZX3n3S2M1T6RSWc7K bbTkfjYMtkR+GzbQrTAykG+NDz7HDrXyTmtUFrFcdzIfiA0L6VpRah+FkJKO4Nufmce/OJZ+QJG+l cqyAZtxzmA5cryw+Bkwbk/heI0mc7zwprg7JnPNCZURSM3444nCLeNvkCOXiWXACCx+yNeYC6W4s5 Zry6DKfd4AvI4rFbi4/p27/JpwxyMbEf6ke7/nWU8fawDoX1yfacYUg1YmfF6U/kIFjwyYGVqBT5A VNZXw6b6d8rx7w==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Sergey Trofimov Subject: Re: [bug#70706] [PATCH] gnu: services: dns: Escape hatch for dnsmasq-configuration. In-Reply-To: (Sergey Trofimov's message of "Wed, 1 May 2024 22:43:31 +0200") References: Date: Thu, 13 Jun 2024 22:43:42 +0200 Message-ID: <8734pginep.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 70706-done Cc: 70706-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Sergey Trofimov skribis: > * gnu/service/dns.scm: ()[extra-options]: Add. > * doc/guix.texi: Document ()[extra-options]. Applied, thanks! From unknown Fri Aug 15 20:53:01 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 12 Jul 2024 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator