dropbear 0.49: Beautify init script output.

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

diff --git a/packages/dropbear/dropbear/init b/packages/dropbear/dropbear/init
index d019bdb4ba67ce8ee90e9159052c971fc3cac39b..5c8dfc12a8968f6ae68c1807d14ee0ed221aad94 100755 (executable)
--- a/packages/dropbear/dropbear/init
+++ b/packages/dropbear/dropbear/init
@@ -50,10 +50,16 @@ gen_keys() {
 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 @@ done
 
 case "$1" in
   start)
-       echo -n "Starting $DESC: "
        gen_keys
+       echo -n "Starting $DESC: "
        KEY_ARGS=""
        test -f $DROPBEAR_DSSKEY && KEY_ARGS="$KEY_ARGS -d $DROPBEAR_DSSKEY"
        test -f $DROPBEAR_RSAKEY && KEY_ARGS="$KEY_ARGS -r $DROPBEAR_RSAKEY"

diff --git a/packages/dropbear/dropbear_0.49.bb b/packages/dropbear/dropbear_0.49.bb
index f98c0ac8f683e88c8cf6898dc26fa1a2d7cc4f5d..0ed386ca0c0a154987780dbbb9ede9ebdcf2d92a 100644 (file)
--- a/packages/dropbear/dropbear_0.49.bb
+++ b/packages/dropbear/dropbear_0.49.bb
@@ -1 +1,3 @@
+PR = "r1"
+
 require dropbear.inc