diff options
| author | Alexander Dahl <ada@thorsis.com> | 2021-11-05 16:47:28 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-11-12 10:12:15 +0100 |
| commit | 5f4f0cfc400120e7e59fa350781f136a1743e898 (patch) | |
| tree | 6165c21f2020bf4dbb3506b1650a81bed53f61fb | |
| parent | 3c822e5aa8e5aed64273df8823cd6d5b56954d03 (diff) | |
| download | ptxdist-5f4f0cfc400120e7e59fa350781f136a1743e898.tar.gz ptxdist-5f4f0cfc400120e7e59fa350781f136a1743e898.tar.xz | |
dropbear: Move targetinstall of rc-once script
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>
| -rw-r--r-- | rules/dropbear.make | 7 |
1 files 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, \ |