From 7107de36842744ee1731ab0937e9117390f9494b Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Thu, 4 Mar 2010 21:33:40 +0100
Subject: [PATCH] dropbear: - various cleanups - remove config dir

---
 packages/network/dropbear/conf.d/sshd    | 11 --------
 packages/network/dropbear/init.d/22_sshd | 36 +++++++++++-------------
 packages/network/dropbear/install        |  2 +-
 3 files changed, 18 insertions(+), 31 deletions(-)
 delete mode 100644 packages/network/dropbear/conf.d/sshd

diff --git a/packages/network/dropbear/conf.d/sshd b/packages/network/dropbear/conf.d/sshd
deleted file mode 100644
index e45d5c7aa7..0000000000
--- a/packages/network/dropbear/conf.d/sshd
+++ /dev/null
@@ -1,11 +0,0 @@
-################################################################################
-# SSH Server environment variables.
-#
-# This file contains non-OpenELEC evironment variables as well as OpenELEC
-# evironment variables that are not user defined.
-################################################################################
-
-#-------------------------------------------------------------------------------
-# Start SSH Server on boot.
-#-------------------------------------------------------------------------------
-OE_START_SSHSERVER=yes
diff --git a/packages/network/dropbear/init.d/22_sshd b/packages/network/dropbear/init.d/22_sshd
index 390271522d..ab11458c62 100755
--- a/packages/network/dropbear/init.d/22_sshd
+++ b/packages/network/dropbear/init.d/22_sshd
@@ -3,30 +3,28 @@
 # runlevels: openelec, text, debug
 
 (
-  if test "$OE_START_SSHSERVER" = "yes" \
-          -a -f /usr/bin/dropbearkey \
-          -a -f /etc/issue ; then
-    progress "Starting SSH Server"
+  # Check for the Dropbear RSA key
+    if [ ! -f /etc/dropbear/dropbear_rsa_host_key ] ; then
+      progress "SSH: generating rsa key"
 
-    # Check for the Dropbear RSA key
-      if [ ! -f /etc/dropbear/dropbear_rsa_host_key ] ; then
-        progress "SSH: generating rsa key"
+      mkdir -p /etc/dropbear
+      /usr/bin/dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key > /dev/null 2>&1
+    fi
 
-        mkdir -p /etc/dropbear
-        /usr/bin/dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key > /dev/null 2>&1
-      fi
+  # Check for the Dropbear DSS key
+    if [ ! -f /etc/dropbear/dropbear_dss_host_key ] ; then
+      progress "SSH: generating dsa key"
 
-    # Check for the Dropbear DSS key
-      if [ ! -f /etc/dropbear/dropbear_dss_host_key ] ; then
-        progress "SSH: generating dsa key"
+      mkdir -p /etc/dropbear
+      /usr/bin/dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key > /dev/null 2>&1
+    fi
 
-        mkdir -p /etc/dropbear
-        /usr/bin/dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key > /dev/null 2>&1
-      fi
+  progress "Starting SSH Server"
 
-    mkdir -p /var/log
+  mkdir -p /var/log
     touch /var/log/lastlog
     touch /var/log/wtmp
-    /usr/sbin/dropbear -b /etc/issue -P /var/run/dropbear.pid
-  fi
+
+  dropbear -b /etc/issue -P /var/run/dropbear.pid
+
 )&
diff --git a/packages/network/dropbear/install b/packages/network/dropbear/install
index ee5f7f2264..bb34dc1fbb 100755
--- a/packages/network/dropbear/install
+++ b/packages/network/dropbear/install
@@ -14,4 +14,4 @@ mkdir -p $INSTALL/usr/bin
   cp -PR $PKG_BUILD/scp $INSTALL/usr/bin
 
 mkdir -p $INSTALL/usr/config/dropbear
-ln -s /storage/.config/dropbear $INSTALL/etc/dropbear
\ No newline at end of file
+  ln -s /storage/.config/dropbear $INSTALL/etc/dropbear
\ No newline at end of file