Thanks, applied as 5f4f0cfc400120e7e59fa350781f136a1743e898. Michael
[sent from post-receive hook] On Fri, 26 Nov 2021 15:34:59 +0100, Alexander Dahl <[email protected]> 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 <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > 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 [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
