From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 26 Nov 2021 15:35:10 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1mqcJi-00048k-SO for lore@lore.pengutronix.de; Fri, 26 Nov 2021 15:35:10 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1mqcJh-0005Eu-To; Fri, 26 Nov 2021 15:35:09 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mqcJZ-0004wo-W5; Fri, 26 Nov 2021 15:35:02 +0100 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1mqcJZ-001Bud-UI; Fri, 26 Nov 2021 15:35:01 +0100 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1mqcJY-0053Mw-IB; Fri, 26 Nov 2021 15:35:00 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 26 Nov 2021 15:35:00 +0100 Message-Id: <20211126143500.1204547-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211105154734.19983-4-ada@thorsis.com> References: <20211105154734.19983-4-ada@thorsis.com> MIME-Version: 1.0 Subject: Re: [ptxdist] [APPLIED] dropbear: Move shell variables to new common shell lib X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Alexander Dahl Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 29b74e865d10c82291e72fbf0dca1701bc5177bc. Michael [sent from post-receive hook] On Fri, 26 Nov 2021 15:35:00 +0100, Alexander Dahl 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 > Message-Id: <20211105154734.19983-4-ada@thorsis.com> > Signed-off-by: Michael Olbrich > > 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 ") > @$(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