From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 18 Oct 2021 16:36:41 +0200 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 1mcTkn-0005mx-5Y for lore@lore.pengutronix.de; Mon, 18 Oct 2021 16:36:41 +0200 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 1mcTkm-0001mi-C4; Mon, 18 Oct 2021 16:36:40 +0200 Received: from mail.thorsis.com ([92.198.35.195]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mcTkF-0001Fl-UO; Mon, 18 Oct 2021 16:36:11 +0200 Received: from localhost (localhost [127.0.0.1]) by mail.thorsis.com (Postfix) with ESMTP id 05A131C96; Mon, 18 Oct 2021 16:36:07 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail.thorsis.com Received: from mail.thorsis.com ([127.0.0.1]) by localhost (mail.thorsis.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6Avn2rOo8j0m; Mon, 18 Oct 2021 16:36:06 +0200 (CEST) Received: by mail.thorsis.com (Postfix, from userid 109) id 3CCC013C; Mon, 18 Oct 2021 16:36:05 +0200 (CEST) Received: from adahl by ada.ifak-system.com with local (Exim 4.92) (envelope-from ) id 1mcTk2-0007Bm-KG; Mon, 18 Oct 2021 16:35:54 +0200 From: Alexander Dahl To: ptxdist@pengutronix.de Date: Mon, 18 Oct 2021 16:35:49 +0200 Message-Id: <20211018143554.27573-4-ada@thorsis.com> In-Reply-To: <20211018143554.27573-1-ada@thorsis.com> References: <20211018143554.27573-1-ada@thorsis.com> X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.6 required=4.0 tests=AWL,BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH v2 3/8] 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: Denis Osterland-Heim , Michael Olbrich , Bruno Thomsen , Alexander Stein MIME-Version: 1.0 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 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 --- 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 ") @$(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