Merge "Fix devuser pubkey defaults"

This commit is contained in:
Jenkins 2015-10-20 01:41:16 +00:00 committed by Gerrit Code Review
commit b902189eaa

View File

@ -11,7 +11,7 @@ if [ -n "$DIB_DEV_USER_AUTHORIZED_KEYS" ]; then
cat $DIB_DEV_USER_AUTHORIZED_KEYS >> $TMP_HOOKS_PATH/devuser-ssh-authorized-keys cat $DIB_DEV_USER_AUTHORIZED_KEYS >> $TMP_HOOKS_PATH/devuser-ssh-authorized-keys
fi fi
else else
for fmt in "rsa dsa"; do for fmt in rsa dsa; do
if [ -f "$HOME/.ssh/id_$fmt.pub" ]; then if [ -f "$HOME/.ssh/id_$fmt.pub" ]; then
cat $HOME/.ssh/id_$fmt.pub >> $TMP_HOOKS_PATH/devuser-ssh-authorized-keys cat $HOME/.ssh/id_$fmt.pub >> $TMP_HOOKS_PATH/devuser-ssh-authorized-keys
break break