From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 26 Nov 2021 15:35:07 +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 1mqcJf-00048J-J2 for lore@lore.pengutronix.de; Fri, 26 Nov 2021 15:35:07 +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 1mqcJf-00055y-3F; Fri, 26 Nov 2021 15:35:07 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mqcJY-0004w3-PV; Fri, 26 Nov 2021 15:35:00 +0100 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1mqcJY-001BuY-Pe; Fri, 26 Nov 2021 15:35:00 +0100 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1mqcJX-0053Lc-9D; Fri, 26 Nov 2021 15:34:59 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 26 Nov 2021 15:34:59 +0100 Message-Id: <20211126143459.1204461-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211105154734.19983-3-ada@thorsis.com> References: <20211105154734.19983-3-ada@thorsis.com> MIME-Version: 1.0 Subject: Re: [ptxdist] [APPLIED] 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: Alexander Dahl 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 Thanks, applied as 5f4f0cfc400120e7e59fa350781f136a1743e898. Michael [sent from post-receive hook] On Fri, 26 Nov 2021 15:34:59 +0100, Alexander Dahl wrote: > 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 > Message-Id: <20211105154734.19983-3-ada@thorsis.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/dropbear.make b/rules/dropbear.make > index c4577fed2685..501b94764899 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, \ _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de