On Tue, Jun 22, 2010 at 12:47:12PM +0200, Alexander Stein wrote: > Signed-off-by: Alexander Stein <[email protected]> > --- > generic/etc/init.d/dropbear | 4 ++--
generic/etc/rc.once.d/dropbear must be changed as well. Why do you need a different directory anyways? mol > rules/dropbear.in | 6 ++++++ > rules/dropbear.make | 4 +++- > 3 files changed, 11 insertions(+), 3 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/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..2f002cd 100644 > --- a/rules/dropbear.make > +++ b/rules/dropbear.make > @@ -280,11 +280,13 @@ 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) > 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] > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- ptxdist mailing list [email protected]
