From 58d6bc99d97b270805628543e9907c7d0fe081d2 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 7 Nov 2010 19:17:11 +0100
Subject: simplify startup script

---
 package/dropbear/Makefile            |  2 +-
 package/dropbear/files/dropbear.init | 16 ++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'package/dropbear')

diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index 310f45d81..5ee4e7d3d 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		dropbear
 PKG_VERSION:=		0.52
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		1c69ec674481d7745452f68f2ea5597e
 PKG_DESCR:=		SSH 2 server/client designed for embedded systems
 PKG_SECTION:=		net/security
diff --git a/package/dropbear/files/dropbear.init b/package/dropbear/files/dropbear.init
index 9983e943c..392d81c78 100644
--- a/package/dropbear/files/dropbear.init
+++ b/package/dropbear/files/dropbear.init
@@ -3,10 +3,6 @@
 #INIT 50
 . /etc/rc.conf
 
-bothlog() {
-	echo "$*"
-}
-
 case $1 in
 autostop) ;;
 autostart)
@@ -17,22 +13,22 @@ start)
 	if test ! -f /etc/dropbear/dropbear_rsa_host_key; then
 		mkdir -p /etc/dropbear
 		if test ! -x /usr/bin/dropbearkey; then
-			bothlog dropbear not starting: SSH private key missing
+			echo "dropbear not starting: SSH private key missing"
 			exit 0
 		fi
-		bothlog "dropbear: generating SSH private key (RSA)"
+		echo "dropbear: generating SSH private key (RSA)"
 		/usr/bin/dropbearkey -f /etc/dropbear/dropbear_rsa_host_key \
-		    -t rsa; rv=$?
-		bothlog dropbear: key generation exited with code $rv
+		    -t rsa ; rv=$?
+		echo "dropbear: key generation exited with code $rv"
 		test $rv = 0 || exit 1
 		test -f /etc/dropbear/dropbear_rsa_host_key || exit 1
 	fi
 	if test ! -f /etc/dropbear/dropbear_dss_host_key; then
 		# take it easy here, since above already catched the worst cases
 		if test -x /usr/bin/dropbearkey; then
-			bothlog "dropbear: generating SSH private key (DSS)"
+			echo "dropbear: generating SSH private key (DSS)"
 			/usr/bin/dropbearkey -f /etc/dropbear/dropbear_dss_host_key -t dss
-			bothlog dropbear: key generation exited with code $?
+			echo "dropbear: key generation exited with code $?"
 		fi
 	fi
 	/usr/sbin/dropbear $dropbear_flags
-- 
cgit v1.2.3