Signed-off-by: Alexander Stein <[email protected]>
---
Changes since v1:
* Also change generic/etc/rc.once.d/dropbear
generic/etc/init.d/dropbear | 4 ++--
generic/etc/rc.once.d/dropbear | 4 ++--
rules/dropbear.in | 6 ++++++
rules/dropbear.make | 6 +++++-
4 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/generic/etc/init.d/dropbear b/generic/etc/init.d/dropbear
index 31025a6..45f8802 100644
--- a/generic/etc/init.d/dropbear
+++ b/generic/etc/init.d/dropbear
@@ -11,8 +11,8 @@ DROPBEAR_EXTRA_ARGS=
# test ! -h /var/service/dropbear || exit 0
-DROPBEAR_RSAKEY_DEFAULT="/etc/dropbear/dropbear_rsa_host_key"
-DROPBEAR_DSSKEY_DEFAULT="/etc/dropbear/dropbear_dss_host_key"
+DROPBEAR_RSAKEY_DEFAULT="@KEYDIR@/dropbear_rsa_host_key"
+DROPBEAR_DSSKEY_DEFAULT="@KEYDIR@/dropbear_dss_host_key"
test -z "$DROPBEAR_BANNER" || \
DROPBEAR_EXTRA_ARGS="$DROPBEAR_EXTRA_ARGS -b $DROPBEAR_BANNER"
diff --git a/generic/etc/rc.once.d/dropbear b/generic/etc/rc.once.d/dropbear
index d5d1843..121fa13 100644
--- a/generic/etc/rc.once.d/dropbear
+++ b/generic/etc/rc.once.d/dropbear
@@ -2,8 +2,8 @@
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DROPBEAR_RSAKEY_DEFAULT="/etc/dropbear/dropbear_rsa_host_key"
-DROPBEAR_DSSKEY_DEFAULT="/etc/dropbear/dropbear_dss_host_key"
+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
diff --git a/rules/dropbear.in b/rules/dropbear.in
index fbbad06..d410454 100644
--- a/rules/dropbear.in
+++ b/rules/dropbear.in
@@ -24,6 +24,12 @@ menuconfig DROPBEAR
if DROPBEAR
+config DROPBEAR_KEY_DIR
+ string "dropbear key directory"
+ default "/etc/dropbear"
+ help
+ This is the directory where dropbear stores the keys.
+
config DROPBEAR_ZLIB
bool
prompt "zlib support"
diff --git a/rules/dropbear.make b/rules/dropbear.make
index cf83488..55539be 100644
--- a/rules/dropbear.make
+++ b/rules/dropbear.make
@@ -280,11 +280,15 @@ endif
ifdef PTXCONF_INITMETHOD_BBINIT
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))
@$(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
endif
- @$(call install_copy, dropbear, 0, 0, 0755, /etc/dropbear)
+ @$(call install_copy, dropbear, 0, 0, 0755, $(PTXCONF_DROPBEAR_KEY_DIR))
@$(call install_finish, dropbear)
--
1.7.1
--
ptxdist mailing list
[email protected]
