X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fdropbear%2Ffiles%2Fdropbear.init;h=aaa4470432af3d1ad2a4d7417d9cfb7d6b6d0829;hb=edd83954812b0a6d12fd76aa1c800f946e00b3ac;hp=58b0bc2fabe99b032663c97b0f5ffc305ef42f4a;hpb=23d76c341a3d89175e6c1014fb07b719813e5d67;p=openwrt-10.03%2F.git

diff --git a/package/dropbear/files/dropbear.init b/package/dropbear/files/dropbear.init
index 58b0bc2fa..aaa447043 100755
--- a/package/dropbear/files/dropbear.init
+++ b/package/dropbear/files/dropbear.init
@@ -1,5 +1,6 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2006 OpenWrt.org
+START=50
 # Copyright (C) 2006 Carlos Sobrinho
 
 config_cb() {
@@ -16,7 +17,7 @@ config_cb() {
 			case "$passauth" in
 				no|off|disabled|0) nopasswd=1;;
 			esac
-			DROPBEAR_ARGS="${port:+-p $port} ${nopasswd:+-s}"
+			DROPBEAR_ARGS="${nopasswd:+-s }${port:+-p $port}"
 		;;
 	esac
 }
@@ -25,7 +26,7 @@ keygen() {
 	for keytype in rsa dss; do
 		# check for keys
 		key=dropbear/dropbear_${keytype}_host_key
-		[ -f /tmp/$key -o -f /etc/$key ] || {
+		[ -f /tmp/$key -o -s /etc/$key ] || {
 			# generate missing keys
 			mkdir -p /tmp/dropbear
 			[ -x /usr/bin/dropbearkey ] && {
@@ -44,8 +45,8 @@ keygen() {
 }
 
 start() {
-	[ -f /etc/dropbear/dropbear_rsa_host_key -a \
-	  -f /etc/dropbear/dropbear_dss_host_key ] || keygen
+	[ -s /etc/dropbear/dropbear_rsa_host_key -a \
+	  -s /etc/dropbear/dropbear_dss_host_key ] || keygen
 	
 	config_load dropbear
 	/usr/sbin/dropbear $DROPBEAR_ARGS