diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-11-22 16:23:37 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-11-22 16:23:37 +0000 |
| commit | 3138b2bd514e09b328be2922c7ef429566a89d1d (patch) | |
| tree | 663071a70e39eecdd5fac19e566585aaf404a484 | |
| parent | e0f4607a9d92714d1173ecfcc89cbd6af3343692 (diff) | |
dropbear 0.49: Beautify init script output.
* Make sure that "Starting: dropbear" message is not broken by host
key generation output.
| -rwxr-xr-x | packages/dropbear/dropbear/init | 12 | ||||
| -rw-r--r-- | packages/dropbear/dropbear_0.49.bb | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/packages/dropbear/dropbear/init b/packages/dropbear/dropbear/init index d019bdb4ba..5c8dfc12a8 100755 --- 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 f98c0ac8f6..0ed386ca0c 100644 --- a/packages/dropbear/dropbear_0.49.bb +++ b/packages/dropbear/dropbear_0.49.bb @@ -1 +1,3 @@ +PR = "r1" + require dropbear.inc |