Re: [ptxdist] [APPLIED] dropbear: Move shell variables to new common shell lib

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as 29b74e865d10c82291e72fbf0dca1701bc5177bc.

Michael

[sent from post-receive hook]

On Fri, 26 Nov 2021 15:35:00 +0100, Alexander Dahl <ada@thorsis.com> wrote:
> 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>
> Message-Id: <20211105154734.19983-4-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/projectroot/etc/init.d/dropbear b/projectroot/etc/init.d/dropbear
> index 4d6530bdcc46..b394eab1548f 100644
> --- a/projectroot/etc/init.d/dropbear
> +++ b/projectroot/etc/init.d/dropbear
> @@ -7,14 +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"
> +# 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_KEYTYPES" || \
>    DROPBEAR_KEYTYPES="rsa"
>  
> diff --git a/projectroot/etc/rc.once.d/dropbear b/projectroot/etc/rc.once.d/dropbear
> index 451236097832..b70f5f22e997 100644
> --- a/projectroot/etc/rc.once.d/dropbear
> +++ b/projectroot/etc/rc.once.d/dropbear
> @@ -2,10 +2,7 @@
>  
>  PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
>  
> -DROPBEAR_RSAKEY_DEFAULT="@KEYDIR@/dropbear_rsa_host_key"
> -
> -test -n "$DROPBEAR_RSAKEY" || \
> -  DROPBEAR_RSAKEY=$DROPBEAR_RSAKEY_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 000000000000..7b94429b4781
> --- /dev/null
> +++ b/projectroot/usr/lib/init/dropbear.sh
> @@ -0,0 +1,3 @@
> +#!/bin/sh
> +
> +DROPBEAR_RSAKEY='@KEYDIR@/dropbear_rsa_host_key'
> diff --git a/rules/dropbear.make b/rules/dropbear.make
> index 501b94764899..bdf855fe388d 100644
> --- a/rules/dropbear.make
> +++ b/rules/dropbear.make
> @@ -273,6 +273,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)
> @@ -283,8 +287,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
> @@ -305,8 +307,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, \

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de