From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Alexander Dahl <ada@thorsis.com>
Subject: Re: [ptxdist] [APPLIED] dropbear: Move targetinstall of rc-once script
Date: Fri, 26 Nov 2021 15:34:59 +0100 [thread overview]
Message-ID: <20211126143459.1204461-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20211105154734.19983-3-ada@thorsis.com>
Thanks, applied as 5f4f0cfc400120e7e59fa350781f136a1743e898.
Michael
[sent from post-receive hook]
On Fri, 26 Nov 2021 15:34:59 +0100, Alexander Dahl <ada@thorsis.com> 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 <ada@thorsis.com>
> Message-Id: <20211105154734.19983-3-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> 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
next prev parent reply other threads:[~2021-11-26 14:35 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-05 15:47 [ptxdist] [PATCH v3 0/8] rc-once: Improve re-generation of keys Alexander Dahl
2021-11-05 15:47 ` [ptxdist] [PATCH v3 1/8] dropbear: Remove host/public key DSS support Alexander Dahl
2021-11-26 14:34 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-11-05 15:47 ` [ptxdist] [PATCH v3 2/8] dropbear: Move targetinstall of rc-once script Alexander Dahl
2021-11-26 14:34 ` Michael Olbrich [this message]
2021-11-05 15:47 ` [ptxdist] [PATCH v3 3/8] dropbear: Move shell variables to new common shell lib Alexander Dahl
2021-11-26 14:35 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-11-05 15:47 ` [ptxdist] [PATCH v3 4/8] dropbear: Move KEYTYPES to shell lib and set based on menu Alexander Dahl
2021-11-26 14:35 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-11-05 15:47 ` [ptxdist] [PATCH v3 5/8] dropbear: Refactor rc-once and init to use KEYTYPES Alexander Dahl
2021-11-26 14:35 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-11-05 15:47 ` [ptxdist] [PATCH v3 6/8] dropbear: Support ecdsa keys in rc-once and init Alexander Dahl
2021-11-26 14:35 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-11-05 15:47 ` [ptxdist] [PATCH v3 7/8] dropbear: rc-once: Regenerate key if invalid key is found Alexander Dahl
2021-11-26 14:35 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-11-05 15:47 ` [ptxdist] [PATCH v3 8/8] openssh: rc-once: Do not overwrite existing keys Alexander Dahl
2021-11-26 14:35 ` [ptxdist] [APPLIED] " Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211126143459.1204461-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=ada@thorsis.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox