From 61e1b31b72cab68e8e15441b384a7065e4eebf9c Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jerome@riseup.net>
Date: Sun, 14 Jan 2018 15:25:55 -0500
Subject: [PATCH] [borg] fix ssh-copy-id when both keytypes exist
---
handlers/borg.helper.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/handlers/borg.helper.in b/handlers/borg.helper.in
index bb9dff9..aac3973 100644
--- a/handlers/borg.helper.in
+++ b/handlers/borg.helper.in
@@ -181,8 +181,8 @@ do_borg_ssh_con() {
ssh -o PreferredAuthentications=publickey $borg_host -l $borg_user "exit" 2> /dev/null
if [ $? -ne 0 ]; then
echo "Copying root's public ssh key to authorized_keys of $borg_user@$borg_host. When prompted, specify the password for user $borg_user@$borg_host."
- ssh-copy-id -i /root/.ssh/id_[rd]sa.pub $borg_user@$borg_host
- if [ $? -ne 0 ]; then
+ pubkeys=( /root/.ssh/id_[rd]sa.pub )
+ if ! ssh-copy-id -i ${pubkeys[0]} $borg_user@$borg_host; then
echo "FAILED: Couldn't copy root's public ssh key to authorized_keys of $borg_user@$borg_host."
ssh $borg_user@$borg_host 'test -w .ssh || test -w .'
result=$?
--
GitLab