From: Alexander Dahl <ada@thorsis.com>
To: ptxdist@pengutronix.de
Cc: Denis Osterland-Heim <denis.osterland@diehl.com>,
Michael Olbrich <m.olbrich@pengutronix.de>,
Bruno Thomsen <bruno.thomsen@gmail.com>,
Alexander Stein <alexander.stein@systec-electronic.com>
Subject: [ptxdist] [PATCH v2 3/8] dropbear: Move shell variables to new common shell lib
Date: Mon, 18 Oct 2021 16:35:49 +0200 [thread overview]
Message-ID: <20211018143554.27573-4-ada@thorsis.com> (raw)
In-Reply-To: <20211018143554.27573-1-ada@thorsis.com>
init script and rc-once script use some common variables and
targetinstall replace happens twice for each, so to make things less
complex put those common variables in a common place.
While at it, remove that DROPBEAR_xxxKEY_DEFAULT indirection, which
probably originates in the init script from Debian, which seems was the
base for developing this script at least 15 years ago.
The lib will be extended with more variables later.
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
projectroot/etc/init.d/dropbear | 9 ++-------
projectroot/etc/rc.once.d/dropbear | 8 +-------
projectroot/usr/lib/init/dropbear.sh | 4 ++++
rules/dropbear.make | 8 ++++----
4 files changed, 11 insertions(+), 18 deletions(-)
create mode 100644 projectroot/usr/lib/init/dropbear.sh
diff --git a/projectroot/etc/init.d/dropbear b/projectroot/etc/init.d/dropbear
index 1edda1116..a308aefde 100644
--- a/projectroot/etc/init.d/dropbear
+++ b/projectroot/etc/init.d/dropbear
@@ -7,17 +7,12 @@ NAME=dropbear
DROPBEAR_PORT=22
DROPBEAR_EXTRA_ARGS=
-# test ! -h /var/service/dropbear || exit 0
+. /usr/lib/init/dropbear.sh
-DROPBEAR_RSAKEY_DEFAULT="@KEYDIR@/dropbear_rsa_host_key"
-DROPBEAR_DSSKEY_DEFAULT="@KEYDIR@/dropbear_dss_host_key"
+# test ! -h /var/service/dropbear || exit 0
test -z "$DROPBEAR_BANNER" || \
DROPBEAR_EXTRA_ARGS="$DROPBEAR_EXTRA_ARGS -b $DROPBEAR_BANNER"
-test -n "$DROPBEAR_RSAKEY" || \
- DROPBEAR_RSAKEY=$DROPBEAR_RSAKEY_DEFAULT
-test -n "$DROPBEAR_DSSKEY" || \
- DROPBEAR_DSSKEY=$DROPBEAR_DSSKEY_DEFAULT
test -n "$DROPBEAR_KEYTYPES" || \
DROPBEAR_KEYTYPES="rsa dss"
diff --git a/projectroot/etc/rc.once.d/dropbear b/projectroot/etc/rc.once.d/dropbear
index a126b26db..dd922d727 100644
--- a/projectroot/etc/rc.once.d/dropbear
+++ b/projectroot/etc/rc.once.d/dropbear
@@ -2,13 +2,7 @@
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DROPBEAR_RSAKEY_DEFAULT="@KEYDIR@/dropbear_rsa_host_key"
-DROPBEAR_DSSKEY_DEFAULT="@KEYDIR@/dropbear_dss_host_key"
-
-test -n "$DROPBEAR_RSAKEY" || \
- DROPBEAR_RSAKEY=$DROPBEAR_RSAKEY_DEFAULT
-test -n "$DROPBEAR_DSSKEY" || \
- DROPBEAR_DSSKEY=$DROPBEAR_DSSKEY_DEFAULT
+. /usr/lib/init/dropbear.sh
gen_key() {
diff --git a/projectroot/usr/lib/init/dropbear.sh b/projectroot/usr/lib/init/dropbear.sh
new file mode 100644
index 000000000..2e3d60f49
--- /dev/null
+++ b/projectroot/usr/lib/init/dropbear.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+DROPBEAR_RSAKEY='@KEYDIR@/dropbear_rsa_host_key'
+DROPBEAR_DSSKEY='@KEYDIR@/dropbear_dss_host_key'
diff --git a/rules/dropbear.make b/rules/dropbear.make
index 901f50563..ce0214d88 100644
--- a/rules/dropbear.make
+++ b/rules/dropbear.make
@@ -270,6 +270,10 @@ $(STATEDIR)/dropbear.targetinstall:
@$(call install_fixup, dropbear,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
@$(call install_fixup, dropbear,DESCRIPTION,missing)
+ @$(call install_alternative, dropbear, 0, 0, 0644, /usr/lib/init/dropbear.sh)
+ @$(call install_replace, dropbear, /usr/lib/init/dropbear.sh, \
+ @KEYDIR@, $(PTXCONF_DROPBEAR_KEY_DIR))
+
ifdef PTXCONF_DROPBEAR_DROPBEAR
@$(call install_copy, dropbear, 0, 0, 0755, -, \
/usr/sbin/dropbear)
@@ -280,8 +284,6 @@ ifdef PTXCONF_DROPBEAR_DROPBEAR_KEY
/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
@@ -302,8 +304,6 @@ endif
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))
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
next prev parent reply other threads:[~2021-10-18 14:36 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-18 14:35 [ptxdist] [PATCH v2 0/8] rc-once: Improve re-generation of keys Alexander Dahl
2021-10-18 14:35 ` [ptxdist] [PATCH v2 1/8] dropbear: Adapt menu comment to available options Alexander Dahl
2021-10-18 14:35 ` [ptxdist] [PATCH v2 2/8] dropbear: Move targetinstall of rc-once script Alexander Dahl
2021-10-18 14:35 ` Alexander Dahl [this message]
2021-10-18 14:35 ` [ptxdist] [PATCH v2 4/8] dropbear: Move KEYTYPES to shell lib and set based on menu Alexander Dahl
2021-10-18 14:35 ` [ptxdist] [PATCH v2 5/8] dropbear: Refactor rc-once and init to use KEYTYPES Alexander Dahl
2021-10-22 8:44 ` Michael Olbrich
2021-10-22 9:05 ` Alexander Dahl
2021-10-28 5:49 ` Michael Olbrich
2021-10-18 14:35 ` [ptxdist] [PATCH v2 6/8] dropbear: Support ecdsa keys in rc-once and init Alexander Dahl
2021-10-22 8:47 ` Michael Olbrich
2021-10-18 14:35 ` [ptxdist] [PATCH v2 7/8] dropbear: rc-once: Regenerate key if invalid key is found Alexander Dahl
2021-10-18 14:35 ` [ptxdist] [PATCH v2 8/8] openssh: rc-once: Do not overwrite existing keys Alexander Dahl
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=20211018143554.27573-4-ada@thorsis.com \
--to=ada@thorsis.com \
--cc=alexander.stein@systec-electronic.com \
--cc=bruno.thomsen@gmail.com \
--cc=denis.osterland@diehl.com \
--cc=m.olbrich@pengutronix.de \
--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