From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 05 Nov 2021 16:48:32 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1mj1SC-0001GG-V9 for lore@lore.pengutronix.de; Fri, 05 Nov 2021 16:48:32 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1mj1SC-0007ra-LW; Fri, 05 Nov 2021 16:48:32 +0100 Received: from mail.thorsis.com ([92.198.35.195]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mj1RR-0007YM-T0; Fri, 05 Nov 2021 16:47:46 +0100 Received: from localhost (localhost [127.0.0.1]) by mail.thorsis.com (Postfix) with ESMTP id 1C3F31D8E; Fri, 5 Nov 2021 16:47:45 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail.thorsis.com Received: from mail.thorsis.com ([127.0.0.1]) by localhost (mail.thorsis.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ioyTeglc0B65; Fri, 5 Nov 2021 16:47:45 +0100 (CET) Received: by mail.thorsis.com (Postfix, from userid 109) id E018CE0D; Fri, 5 Nov 2021 16:47:44 +0100 (CET) Received: from adahl by ada.ifak-system.com with local (Exim 4.92) (envelope-from ) id 1mj1RG-0005DH-OF; Fri, 05 Nov 2021 16:47:34 +0100 From: Alexander Dahl To: ptxdist@pengutronix.de Date: Fri, 5 Nov 2021 16:47:28 +0100 Message-Id: <20211105154734.19983-3-ada@thorsis.com> In-Reply-To: <20211105154734.19983-1-ada@thorsis.com> References: <20211105154734.19983-1-ada@thorsis.com> X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.6 required=4.0 tests=AWL,BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH v3 2/8] dropbear: Move targetinstall of rc-once script X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Denis Osterland-Heim , Michael Olbrich , Bruno Thomsen , Alexander Stein MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Key generation is still needed if someone decides not to install the init script or uses a different init system. Fixes: 0e0f5d31e0e0 ("[dropbear] use rc-once to create server keys") Signed-off-by: Alexander Dahl --- rules/dropbear.make | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rules/dropbear.make b/rules/dropbear.make index c4577fed2..501b94764 100644 --- a/rules/dropbear.make +++ b/rules/dropbear.make @@ -281,6 +281,10 @@ endif ifdef PTXCONF_DROPBEAR_DROPBEAR_KEY @$(call install_copy, dropbear, 0, 0, 0755, -, \ /usr/bin/dropbearkey) + + @$(call install_alternative, dropbear, 0, 0, 0755, /etc/rc.once.d/dropbear, n) + @$(call install_replace, dropbear, /etc/rc.once.d/dropbear, \ + @KEYDIR@, $(PTXCONF_DROPBEAR_KEY_DIR)) endif ifdef PTXCONF_DROPBEAR_DROPBEAR_CONVERT @@ -303,9 +307,6 @@ ifdef PTXCONF_DROPBEAR_STARTSCRIPT @$(call install_alternative, dropbear, 0, 0, 0755, /etc/init.d/dropbear, n) @$(call install_replace, dropbear, /etc/init.d/dropbear, \ @KEYDIR@, $(PTXCONF_DROPBEAR_KEY_DIR)) - @$(call install_alternative, dropbear, 0, 0, 0755, /etc/rc.once.d/dropbear, n) - @$(call install_replace, dropbear, /etc/rc.once.d/dropbear, \ - @KEYDIR@, $(PTXCONF_DROPBEAR_KEY_DIR)) ifneq ($(call remove_quotes,$(PTXCONF_DROPBEAR_BBINIT_LINK)),) @$(call install_link, dropbear, \ -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de