From c8f48e8c7f11dc82c9505487abff26df83c97cad Mon Sep 17 00:00:00 2001 From: Tharre Date: Thu, 14 Jun 2018 19:30:57 +0200 Subject: arch-system: borgbackup: check connection with ssh Networkmanager isn't really all that reliable, and we actually don't want to depend on it anyway. So trying to connect via ssh is the better thing to do. --- arch-system/borgbackup | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'arch-system/borgbackup') diff --git a/arch-system/borgbackup b/arch-system/borgbackup index 05ae2ea..9c298c5 100755 --- a/arch-system/borgbackup +++ b/arch-system/borgbackup @@ -2,13 +2,14 @@ set -o errexit -o errtrace -export BORG_REPO="borg@borg1.th73.ovh:." +BORG_HOST="borg@borg1.th73.ovh" +export BORG_REPO="$BORG_HOST:." export BORG_PASSPHRASE="$(< ~/.borg_secret)" export BORG_RSH="ssh -o IdentitiesOnly=yes -o ConnectionAttempts=20 -i ~/.ssh/borg_key" export LC_COLLATE=C SNAPSHOT_TARGET="/.snapshots/home-$(date "+%Y-%m-%dT%H:%M:%S")" -NETWORK_TIMEOUT=120 +NETWORK_TIMEOUT=30 cleanup() { cd / @@ -55,16 +56,11 @@ if [ ! -d "$SNAPSHOT_TARGET" ]; then sudo -n backup-sudo snapshot "$SNAPSHOT_TARGET" fi -i=0 -while [ "$(nmcli -g connectivity general status)" = "none" ]; do - i=$[$i+1] - if [ $i -gt "$NETWORK_TIMEOUT" ]; then - echo "Network not up, skipping upload" >&2 - exit 0 - fi - - sleep 1 -done +if ! ssh -To BatchMode=yes -o ConnectTimeout=$NETWORK_TIMEOUT "$BORG_HOST" \ + "borg --version" > /dev/null; then + echo "SSH server not reachable, skipping upload" >&2 + exit 0 +fi # break locks in case the previous run was interrupted borg break-lock -- cgit v1.2.3-70-g09d2