From unknown Sun Jun 15 08:16:44 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#70670 <70670@debbugs.gnu.org> To: bug#70670 <70670@debbugs.gnu.org> Subject: Status: [PATCH 0/2] Fix tftp-unique-root option for service dnsmasq Reply-To: bug#70670 <70670@debbugs.gnu.org> Date: Sun, 15 Jun 2025 15:16:44 +0000 retitle 70670 [PATCH 0/2] Fix tftp-unique-root option for service dnsmasq reassign 70670 guix-patches submitter 70670 Jean-Baptiste Note severity 70670 normal tag 70670 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 30 08:58:34 2024 Received: (at submit) by debbugs.gnu.org; 30 Apr 2024 12:58:34 +0000 Received: from localhost ([127.0.0.1]:59464 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1n45-00036Z-LW for submit@debbugs.gnu.org; Tue, 30 Apr 2024 08:58:34 -0400 Received: from lists.gnu.org ([2001:470:142::17]:37444) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1n42-00036T-Jn for submit@debbugs.gnu.org; Tue, 30 Apr 2024 08:58:32 -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 1s1n3a-0007lV-KK for guix-patches@gnu.org; Tue, 30 Apr 2024 08:58:02 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s1n3Y-0006nk-HG for guix-patches@gnu.org; Tue, 30 Apr 2024 08:58:02 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-41b2119da94so45190715e9.0 for ; Tue, 30 Apr 2024 05:57:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=m4x.org; s=gapps; t=1714481876; x=1715086676; 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=hCALru+nXU/ZhEMZOeLZzhB1lVDxodHMXPHN7Y6GpVM=; b=FipRhuWayQfDXDPLZZY/i5Gb4IRgnaFZ+KxcrVT6PFhpM/0fg10Q+Ql//3/i1rbco4 oQ9gP8dW11cVjoWf9iuFe1qTTAv3CsyoK/r5JCY3/+7VKUHQBI5QRIBul4A6Kb2a4Dpi +C/HSjN5+kfULHgeidSdLPo/wuPf5xOcwoTzw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714481876; x=1715086676; 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=hCALru+nXU/ZhEMZOeLZzhB1lVDxodHMXPHN7Y6GpVM=; b=AI3/aZt6g2jhDHvNAW2nwab5k/F+5z6tq0gUB4U9WuDIYy8AbiG84wqP+4QwaX9kN5 uUgzW8VLF0Xm3nrSskT5RRoHU9yk1wwKYpCEZEPY5AvYkVqfMLDfJfLf5vnEmAYXxXYy a4aM0s/xO2XET++3blmhdiwGTonJ6bVJNlkPs6Ls6DiH21KR9n8BEnOpPZIiTzTNAa96 /8LCAfvCLPqvFLFnuCePDs84cYqIIJNFzMMolGKxkkOXmr5z8Zaeup+q4YitgerrnCVY Bp7qubthtLmAUHTzs/jWdngVqKP0f1RXUrqzbQAEUJLdpIjEVqNKGmzie+00Zr6VZQ4t 56Qw== X-Gm-Message-State: AOJu0YxvrTfG+Sp5WAQh2EbJIYTfEKzduUlovzdoLZGfsXe8EBuBPIvL 0g7YS751L8FP62fEeJXNx22BXqY2WcNGwofED7hZhjUMPwNrPc+iB1RzPwJl7Sk/nM0idihFuqC glLj0mzSymQWfPAyzOdnJg9D2TiOmYefsH70hYGr95SgmM3TBbkDb3rKGI0vBa8yCG//cKl3QWU 86x4ThEq2ro94kQwSgly82N85iLKStmrbES2GCFmjPQXErdW+ZpjTHj2V8PM0/wA== X-Google-Smtp-Source: AGHT+IFb36PKRBNRkKh8O9v2cVwTbytQNfYTBJbADmvTNVnZOwOgMedUDkAvOoIhiEDBVk8501NZWQ== X-Received: by 2002:a05:600c:4e45:b0:41c:1232:5028 with SMTP id e5-20020a05600c4e4500b0041c12325028mr2004386wmq.13.1714481875599; Tue, 30 Apr 2024 05:57:55 -0700 (PDT) Received: from guixrules.lan (2a01cb0808d89bcce2cec3fffe74cec8.ipv6.abo.wanadoo.fr. [2a01:cb08:8d8:9bcc:e2ce:c3ff:fe74:cec8]) by smtp.gmail.com with ESMTPSA id fc9-20020a05600c524900b0041ac5f19213sm26719092wmb.8.2024.04.30.05.57.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Apr 2024 05:57:55 -0700 (PDT) From: Jean-Baptiste Note To: guix-patches@gnu.org Subject: [PATCH 0/2] Fix tftp-unique-root option for service dnsmasq Date: Tue, 30 Apr 2024 12:57:35 +0000 Message-ID: <20240430125738.24600-1-jean-baptiste.note@m4x.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: ( , Christopher Baines , Ludovic Courtès , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=jean-baptiste.note.1999@polytechnique.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.248, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit Cc: Jean-Baptiste Note 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.1 (/) The tftp-unique-root option, though well-documented, currently does not work for me when passing it a string. Fix the option and try to improve the documentation related to it. Jean-Baptiste Note (2): services: dnsmasq: Fix tftp-unique-root option. doc: Augment dnsmasq-service-type documentation. doc/guix.texi | 7 ++++++- gnu/services/dns.scm | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 30 09:05:32 2024 Received: (at 70670) by debbugs.gnu.org; 30 Apr 2024 13:05:32 +0000 Received: from localhost ([127.0.0.1]:59470 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1nAp-0003BQ-Lz for submit@debbugs.gnu.org; Tue, 30 Apr 2024 09:05:32 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:58735) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1nAk-0003BH-7t for 70670@debbugs.gnu.org; Tue, 30 Apr 2024 09:05:30 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-41ba1ba5592so27951475e9.1 for <70670@debbugs.gnu.org>; Tue, 30 Apr 2024 06:05:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=m4x.org; s=gapps; t=1714482299; x=1715087099; darn=debbugs.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=UVl5sFZaR6getmUse9qKiSd0bbswvCjxmiVRVZCCOLY=; b=HtpHRw4zgkVN1GILqAMSUXGH1+Uupq0r15cyhqfsfJ0HbBnxr3YzFIs8SdS1JKZ7yu WOvrq/1bD7FpyCtuJn5de4TopIkdmzDhb79AX2a9cjmJ6+Ky4a/tHxAOzom9ztNjHjAp j0PN/AeYzTE+yyQCFKGduJsQLA+ostCMIX4w0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714482299; x=1715087099; 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=UVl5sFZaR6getmUse9qKiSd0bbswvCjxmiVRVZCCOLY=; b=iJayYHAt+GkWUJwCB96gBAsJ5zWM4vukgTR8ss6RrzxBwtMZiIb3Gk+pMLKXwr4c0B wPjYxcMaM60GpBuKxVRy75hut7E1BuRdUpgHejYOA4W8m1j+4iBZP2eKrinSjbfcajrP b8ovYp26+1tKvkbMpZWOr4z4auJ7Ec1+WodnNrEJSHqVkvtFdjYDe32sil/6KdBTbJcM ZGdz5N7SyDxlnOAZ7sRndVZtH3J18+UXm4r7RUqg5AAHka6Y2+rEhh3HWJF6OWed8Ukd JbprO8biE7TGTCKtHGupci5dN3m8UIB3vHlVWUhPkKQv7X2jaQmA4Gpf5UNH6HfIE1PJ H2sA== X-Gm-Message-State: AOJu0YyRh67mtd9PGzO6JASN4E4G7oBkFmpNeUNzxTWKF5sfXaqixiBZ CEEg0DMA67STbhU4J89gZvYdNeAiXHQiWysDxWPrHtN8mYNg4kqDXy+UexKrY9R4o9OzbsLFKqf Ka7w8GKgbFnyFcLVhqurqYHbKKrAoqDIkmlxYiVR1Yjlpz9Bf4IyvGd2fplpr9vI6nQ1OZGbwOp p8H2LRqRhsoiesbq8zqsYhxeUXNb6os0X7oBYQsAUBbDsn8pen2tMl52Ljm960XbI= X-Google-Smtp-Source: AGHT+IFQkQ+oyfto5mzc3lGTRUYKiLXhDSLeHlZhEXgqR6wTJcm1HMOBOy2YVI+fBNp+xYHgrcQ+NQ== X-Received: by 2002:a05:600c:4f84:b0:41a:aa6:b59e with SMTP id n4-20020a05600c4f8400b0041a0aa6b59emr12891494wmq.5.1714482299092; Tue, 30 Apr 2024 06:04:59 -0700 (PDT) Received: from guixrules.lan (2a01cb0808d89bcce2cec3fffe74cec8.ipv6.abo.wanadoo.fr. [2a01:cb08:8d8:9bcc:e2ce:c3ff:fe74:cec8]) by smtp.gmail.com with ESMTPSA id g9-20020a05600c310900b0041a9fc2a6b5sm28506639wmo.20.2024.04.30.06.04.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Apr 2024 06:04:58 -0700 (PDT) From: Jean-Baptiste Note To: 70670@debbugs.gnu.org Subject: [PATCH 1/2] services: dnsmasq: Fix tftp-unique-root option. Date: Tue, 30 Apr 2024 13:04:31 +0000 Message-ID: <20240430130449.7992-1-jean-baptiste.note@m4x.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 70670 Cc: Jean-Baptiste Note 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.8 (/) * gnu/services/dns.scm (dnsmasq-shepherd-service): tftp-unique-root is a string and its length is taken with string-length. --- gnu/services/dns.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm index 6608046909..ff169f4e8d 100644 --- a/gnu/services/dns.scm +++ b/gnu/services/dns.scm @@ -874,7 +874,7 @@ (define (dnsmasq-shepherd-service config) '()) #$@(if tftp-unique-root (list - (if (> (length tftp-unique-root) 0) + (if (> (string-length tftp-unique-root) 0) (format #f "--tftp-unique-root=~a" tftp-unique-root) (format #f "--tftp-unique-root"))) '())) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 30 09:05:36 2024 Received: (at 70670) by debbugs.gnu.org; 30 Apr 2024 13:05:36 +0000 Received: from localhost ([127.0.0.1]:59472 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1nAu-0003Bf-2H for submit@debbugs.gnu.org; Tue, 30 Apr 2024 09:05:36 -0400 Received: from mail-lf1-x144.google.com ([2a00:1450:4864:20::144]:57756) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1nAp-0003BK-Bd for 70670@debbugs.gnu.org; Tue, 30 Apr 2024 09:05:32 -0400 Received: by mail-lf1-x144.google.com with SMTP id 2adb3069b0e04-516d3a470d5so7018710e87.3 for <70670@debbugs.gnu.org>; Tue, 30 Apr 2024 06:05:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=m4x.org; s=gapps; t=1714482304; x=1715087104; darn=debbugs.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=XpnrGS4oY1F7OmomODpihZrpTZVJaCKXejiCFl4txRE=; b=ay4My7aHsLCh99yrcCK4Nw8PsmnAvULOZZUemUrWSSdbOt/VF67pI2tfEzIiTnVCT5 mrwr8ydn91vYvPeM4EIos/509jKKd8y7UgSSwIfkas9hgHNVGUnZEFUQacjBY7/o8l1q E7wwf4qADDH1Hi3SgSldoygI3Brv7QEQvNpds= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714482304; x=1715087104; 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=XpnrGS4oY1F7OmomODpihZrpTZVJaCKXejiCFl4txRE=; b=gigYY6cx7r8GZ/SeUV00rTG8fi+Sy8XN2dZ/LxRQUA8crRK4LsSj/5LE21MmATqLuS YWwqfVavZFk+pOMI21yRwVtqZXps1+Hf8s3oTRQFpJAEw14VI1OE1X/ypGs2u8igbf/y UIX8DTWTGBsIWMjt2sFbfMsNR0pwZnPX52jk4avJ8UTSbZ/+ZtrCw1Gu+9i5KAbiT1s6 +DO0W5qAWwYiFeeFI/djvYHPBuj9qa7xmFyJAffKYgtXIl6Pb1DelcL+Df79jm+Fyw6x XFNhgnrHPQpD+2b/4mYPEEoZ/Fo+Yj+cVR9nheRBRKgRSkutRSVJ5WWRoyK/HfjUlnDF E8qg== X-Gm-Message-State: AOJu0Yyl00La8x4leKbihP3ADYZ/xNU2X+ZCrxATuqNpYTS7Kp+eLdp9 XQG+GdGLDbh0fayNPOKdmfZJchopCI1aOGYkNtYcuRaMN8HPGGJpFv0pyDSf4/uHxzzJCFAtwa2 DZJYnN49n5I7QWdtClMQjv9U2JgAugPABtOnFPB4rpQ25eNMGgBNgSdHzjszUhtY8Eq5CAiacLA Je1hIO8rAoYqOlpZp9qnuPltI4G335Bua1Xh+l1F4OnhQWh7ErTuFIrTa2qkEHB/q8xA== X-Google-Smtp-Source: AGHT+IGUOTJvgWqp3NybeTsANfTA+01lKPpSPDj4lu06RusjXskM1wGTlWVUV8Y7QC+FDRCp7JcdKg== X-Received: by 2002:a05:6512:3e07:b0:51d:8b97:58d5 with SMTP id i7-20020a0565123e0700b0051d8b9758d5mr7858210lfv.49.1714482302215; Tue, 30 Apr 2024 06:05:02 -0700 (PDT) Received: from guixrules.lan (2a01cb0808d89bcce2cec3fffe74cec8.ipv6.abo.wanadoo.fr. [2a01:cb08:8d8:9bcc:e2ce:c3ff:fe74:cec8]) by smtp.gmail.com with ESMTPSA id g9-20020a05600c310900b0041a9fc2a6b5sm28506639wmo.20.2024.04.30.06.05.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Apr 2024 06:05:01 -0700 (PDT) From: Jean-Baptiste Note To: 70670@debbugs.gnu.org Subject: [PATCH 2/2] doc: Augment dnsmasq-service-type documentation. Date: Tue, 30 Apr 2024 13:04:32 +0000 Message-ID: <20240430130449.7992-2-jean-baptiste.note@m4x.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 70670 Cc: Jean-Baptiste Note 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.8 (/) doc/guix.texi: Fix typo in --tftp-root logic description. Add paragraph about the precise behaviour of the tftp-unique-root parameter. --- doc/guix.texi | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 3f5d4e7f0d..3a9afcd814 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -33463,12 +33463,17 @@ format). For instance, if @option{--tftp-root} is @samp{/tftp} and client @samp{1.2.3.4} requests file @file{myfile} then the effective path will be @file{/tftp/1.2.3.4/myfile} if @file{/tftp/1.2.3.4} exists or -@file{/tftp/myfile} otherwise. When @samp{=mac} is specified it will +@file{/tftp/myfile} otherwise. When @samp{mac} is specified it will append the MAC address instead, using lowercase zero padded digits separated by dashes, e.g.: @samp{01-02-03-04-aa-bb}. Note that resolving MAC addresses is only possible if the client is in the local network or obtained a DHCP lease from dnsmasq. +The empty string yields a naked @option{--tftp-unique-root} argument to +@command{dnsmasq}; any other string @samp{str} will yield +@option{--tftp-unique-root=str}. Currently admissible values for +@command{dnsmasq} are @samp{mac} and @samp{ip}. + @end table @end deftp -- 2.41.0