From patchwork Sun Sep 20 21:03:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stijn Segers X-Patchwork-Id: 1367988 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=volatilesystems.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=hmH4Bdbl; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=volatilesystems.org header.i=@volatilesystems.org header.a=rsa-sha256 header.s=mail header.b=OGHAR1tw; dkim=fail reason="signature verification failed" (1024-bit key) header.d=volatilesystems.org header.i=@volatilesystems.org header.a=rsa-sha256 header.s=mail header.b=b6MEUagB; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bvg853JVzz9sRf for ; Mon, 21 Sep 2020 07:05:25 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:To:From: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=JT1yVTvh4RbnlHOPs83Yjcf1hu90DeREpCInlVuKpXU=; b=hmH4Bdblxd7vnF0IsPV1CkSUy1 7pKCEFrXVBsvxbrPWUTpOes44180LokrV584XPYet9sQSfg8FJ0q7Qt3T7VN0ohar6fzUteIwY6ZU uz9lwNum+EQvVqX0/h+PXOQjr8H94UMlWrrD230PRp9F36ER3slrrydiQTLRquMjesn/5VL81f9Uo IA0YB9lcPZInY06FDhT3ZqxoJU7/MD0ykO3LMvMxNxqR5Bqykus808C66kdrPBPSExv7HMbTaCJOu 2vfJJFRHzubhMFgqWdPWgoZ5UZE8QArL3dIBR9lEPZvjp0pvw9vW4QD80NyDhL9snrMn5FWRN4XLp TRXiYuZg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kK6Ut-0001ql-21; Sun, 20 Sep 2020 21:03:47 +0000 Received: from [2001:41d0:305:2100::8f39] (helo=volatilesystems.org) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kK6Uq-0001qC-9Q for openwrt-devel@lists.openwrt.org; Sun, 20 Sep 2020 21:03:45 +0000 Received: by volatilesystems.org (Postfix, from userid 112) id 97EEEFE17D; Sun, 20 Sep 2020 23:03:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=volatilesystems.org; s=mail; t=1600635817; bh=qhR2Yhd7C0IR4ZI9afYUKbvjh5Iwj3rFF3+lPzFsPek=; h=From:To:Subject:Date:In-Reply-To:References:From; b=OGHAR1twaWuiD2OeYpJSArKGw9OqjAJvT/I0+Axmrl3YADVgmP7nqzBMlJiS2PVwB FVNekjEgZZjfabe9J6GI46N9HcSNLKLyCGPh0BP20Xfl9vRPlqlbuRg1Drw2DhwzgH 8Imqf1QLn3qJ+GxrI4RUvkkJXPhEedNJm3vLP2t4= X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on atalanta X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from okeanos.lan (unknown [213.219.165.25]) by volatilesystems.org (Postfix) with ESMTPSA id C4D6DFE17B for ; Sun, 20 Sep 2020 23:03:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=volatilesystems.org; s=mail; t=1600635816; bh=qhR2Yhd7C0IR4ZI9afYUKbvjh5Iwj3rFF3+lPzFsPek=; h=From:To:Subject:Date:In-Reply-To:References:From; b=b6MEUagBtd+k3L7ask5rqEa96U2RzxkuJ2pzEf8EYrC/CPla35TSt8tdVJ5EcCljM 84vzFg3roEhNqCiEs7DR9UxSz1a//PGBzYQN4B1/z8R1jMyPKUH7y4faOqboVEIlaz 8EOo76cRppnNAhWxD8i3Ak66QQM0Cdi4An8NE4eE= From: Stijn Segers To: openwrt-devel@lists.openwrt.org Subject: [PATCH v2] odhcpd: number UCI defaults script Date: Sun, 20 Sep 2020 23:03:32 +0200 Message-Id: <20200920210332.3800-1-foss@volatilesystems.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200920204833.2878-1-foss@volatilesystems.org> References: <20200920204833.2878-1-foss@volatilesystems.org> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at atalanta X-Virus-Status: Clean X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200920_170344_426497_FB56C42B X-CRM114-Status: GOOD ( 13.49 ) X-Spam-Score: 1.1 (+) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (1.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org UCI defaults scripts are supposed to be numbered, but odhcpd's lacked numbering, which turned out to mess up my custom scripts numbered 9[0-9]_*. The idea is to have high number (custom) scripts executed last. Jow confirmed numbering is the default case, not the exception (thanks). Signed-off-by: Stijn Segers --- package/network/services/odhcpd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/network/services/odhcpd/Makefile b/package/network/services/odhcpd/Makefile index d3e131caec..62dd53774d 100644 --- a/package/network/services/odhcpd/Makefile +++ b/package/network/services/odhcpd/Makefile @@ -100,7 +100,7 @@ define Package/odhcpd/install $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/odhcpd.init $(1)/etc/init.d/odhcpd $(INSTALL_DIR) $(1)/etc/uci-defaults - $(INSTALL_BIN) ./files/odhcpd.defaults $(1)/etc/uci-defaults + $(INSTALL_BIN) ./files/odhcpd.defaults $(1)/etc/uci-defaults/15_odhcpd endef Package/odhcpd-ipv6only/install = $(Package/odhcpd/install)