[oe-commits] org.oe.dev dropbear 0.49: Beautify init script output.

[pfalcon commit]

dropbear 0.49: Beautify init script output.
* Make sure that "Starting: dropbear" message is not broken by host
key generation output.

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: fbf68cc9245c99890a7243d02341cbd6840ac6b9
ViewMTN: http://monotone.openembedded.org/revision/info/fbf68cc9245c99890a7243d02341cbd6840ac6b9
Files:
1
packages/dropbear/dropbear/init
packages/dropbear/dropbear_0.49.bb
Diffs:

#
# mt diff -r76f06a5988d70fee08f03f1cff7a1b210b79f9ca -rfbf68cc9245c99890a7243d02341cbd6840ac6b9
#
# 
# 
# patch "packages/dropbear/dropbear/init"
#  from [45b9ebed88af2de0bfe8e8d2abc1d01ff29b19c9]
#    to [dc87c2bfcc739f6c78f4d67c3d60adf9809efb2f]
# 
# patch "packages/dropbear/dropbear_0.49.bb"
#  from [1652aef0bcc137fa060869697210c0439a28298c]
#    to [ca38761fd3af49819c41b42791592ee01c0d97cc]
# 
============================================================
--- packages/dropbear/dropbear/init	45b9ebed88af2de0bfe8e8d2abc1d01ff29b19c9
+++ packages/dropbear/dropbear/init	dc87c2bfcc739f6c78f4d67c3d60adf9809efb2f
@@ -50,10 +50,16 @@ for t in $DROPBEAR_KEYTYPES; do
 for t in $DROPBEAR_KEYTYPES; do
   case $t in
     rsa)
-        test -f $DROPBEAR_RSAKEY || dropbearkey -t rsa -f $DROPBEAR_RSAKEY
+	if [ ! -f $DROPBEAR_RSAKEY ]; then
+	    echo "Creating $DESC RSA host key."
+	    dropbearkey -t rsa -f $DROPBEAR_RSAKEY
+	fi
 	;;
     dsa)
-        test -f $DROPBEAR_DSSKEY || dropbearkey -t dss -f $DROPBEAR_DSSKEY
+	if [ ! -f $DROPBEAR_DSSKEY ]; then
+	    echo "Creating $DESC DSA host key."
+	    dropbearkey -t dss -f $DROPBEAR_DSSKEY
+	fi
 	;;
   esac
 done
@@ -61,8 +67,8 @@ case "$1" in
 
 case "$1" in
   start)
+	gen_keys
 	echo -n "Starting $DESC: "
-	gen_keys
 	KEY_ARGS=""
 	test -f $DROPBEAR_DSSKEY && KEY_ARGS="$KEY_ARGS -d $DROPBEAR_DSSKEY"
 	test -f $DROPBEAR_RSAKEY && KEY_ARGS="$KEY_ARGS -r $DROPBEAR_RSAKEY"
============================================================
--- packages/dropbear/dropbear_0.49.bb	1652aef0bcc137fa060869697210c0439a28298c
+++ packages/dropbear/dropbear_0.49.bb	ca38761fd3af49819c41b42791592ee01c0d97cc
@@ -1 +1,3 @@
+PR = "r1"
+
 require dropbear.inc