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 <[email protected]> --- 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 <[email protected]>") @$(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 [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
