From patchwork Tue Apr 30 13:04:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Baptiste Note X-Patchwork-Id: 26743 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 E404D27BBEC; Tue, 30 Apr 2024 14:06:02 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 9ECE127BBE9 for ; Tue, 30 Apr 2024 14:06:01 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s1nB7-00026u-7c; Tue, 30 Apr 2024 09:05:49 -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 1s1nB1-00024w-Pv for guix-patches@gnu.org; Tue, 30 Apr 2024 09:05:44 -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 1s1nAz-00089q-Pt for guix-patches@gnu.org; Tue, 30 Apr 2024 09:05:43 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s1nBK-0003Bv-27 for guix-patches@gnu.org; Tue, 30 Apr 2024 09:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70670] [PATCH 1/2] services: dnsmasq: Fix tftp-unique-root option. References: <20240430125738.24600-1-jean-baptiste.note@m4x.org> In-Reply-To: <20240430125738.24600-1-jean-baptiste.note@m4x.org> Resent-From: Jean-Baptiste Note Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 30 Apr 2024 13:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70670 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70670@debbugs.gnu.org Cc: Jean-Baptiste Note Received: via spool by 70670-submit@debbugs.gnu.org id=B70670.171448233212244 (code B ref 70670); Tue, 30 Apr 2024 13:06:02 +0000 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 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 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 * 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"))) '())) From patchwork Tue Apr 30 13:04:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Baptiste Note X-Patchwork-Id: 26744 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 E77E127BBE9; Tue, 30 Apr 2024 14:06:04 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 9D45C27BBE2 for ; Tue, 30 Apr 2024 14:06:01 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s1nB8-000270-5G; Tue, 30 Apr 2024 09:05:50 -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 1s1nB1-00024v-Pq for guix-patches@gnu.org; Tue, 30 Apr 2024 09:05:44 -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 1s1nAz-0008A0-T1 for guix-patches@gnu.org; Tue, 30 Apr 2024 09:05:43 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s1nBK-0003C2-Et for guix-patches@gnu.org; Tue, 30 Apr 2024 09:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70670] [PATCH 2/2] doc: Augment dnsmasq-service-type documentation. References: <20240430125738.24600-1-jean-baptiste.note@m4x.org> In-Reply-To: <20240430125738.24600-1-jean-baptiste.note@m4x.org> Resent-From: Jean-Baptiste Note Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 30 Apr 2024 13:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70670 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70670@debbugs.gnu.org Cc: Jean-Baptiste Note Received: via spool by 70670-submit@debbugs.gnu.org id=B70670.171448233612259 (code B ref 70670); Tue, 30 Apr 2024 13:06:02 +0000 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 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 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 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