summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNigel Kukard <nkukard@lbsd.net>2008-04-08 17:47:29 +0000
committerNigel Kukard <nkukard@lbsd.net>2008-04-08 17:47:29 +0000
commit82b6fbe4e212ea542a1bd20e4555353fe95877dc (patch)
tree2e4f95d546ef1758677ca08dd8a90b5565b6d04d
parent8e94f301ebe7ea3971d8a1bb6ecd5f7a8dd6eb93 (diff)
* Generate keys for dropbear only when starting
* Generate keys silently
-rw-r--r--package/dropbear/dropbear-init.patch37
1 files changed, 19 insertions, 18 deletions
diff --git a/package/dropbear/dropbear-init.patch b/package/dropbear/dropbear-init.patch
index 78b280999..9a44c7f71 100644
--- a/package/dropbear/dropbear-init.patch
+++ b/package/dropbear/dropbear-init.patch
@@ -1,5 +1,6 @@
---- dropbear-0.42/S50dropbear
-+++ dropbear-0.42/S50dropbear
+diff -rNu dropbear-0.51_vanilla/S50dropbear dropbear-0.51_init/S50dropbear
+--- dropbear-0.51_vanilla/S50dropbear 1970-01-01 00:00:00.000000000 +0000
++++ dropbear-0.51_init/S50dropbear 2008-04-08 14:46:53.000000000 +0000
@@ -0,0 +1,56 @@
+#!/bin/sh
+#
@@ -9,24 +10,24 @@
+# Make sure the dropbearkey progam exists
+[ -f /usr/bin/dropbearkey ] || exit 0
+
-+# Check for the Dropbear RSA key
-+if [ ! -f /etc/dropbear/dropbear_rsa_host_key ] ; then
-+ echo Generating RSA Key...
-+ mkdir -p /etc/dropbear
-+ /usr/bin/dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key
-+fi
-+
-+# Check for the Dropbear DSS key
-+if [ ! -f /etc/dropbear/dropbear_dss_host_key ] ; then
-+ echo Generating DSS Key...
-+ mkdir -p /etc/dropbear
-+ /usr/bin/dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key
-+fi
-+
-+umask 077
-+
+start() {
+ echo -n "Starting dropbear sshd: "
++ # Make sure dropbear directory exists
++ if [ ! -d /etc/dropbear ] ; then
++ mkdir -p /etc/dropbear
++ fi
++ # Check for the Dropbear RSA key
++ if [ ! -f /etc/dropbear/dropbear_rsa_host_key ] ; then
++ /usr/bin/dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key > /dev/null 2>&1
++ echo -n .
++ fi
++
++ # Check for the Dropbear DSS key
++ if [ ! -f /etc/dropbear/dropbear_dss_host_key ] ; then
++ /usr/bin/dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key > /dev/null 2>&1
++ echo -n .
++ fi
++ umask 077
+ start-stop-daemon -S -q -p /var/run/dropbear.pid --exec /usr/sbin/dropbear
+ echo "OK"
+}