arch-system: borgbackup: check network status

1 files changed, 15 insertions, 4 deletions

diff --git a/arch-system/borgbackup b/arch-system/borgbackup
index 5cc635d..1f49569 100755
--- a/arch-system/borgbackup
+++ b/arch-system/borgbackup
@@ -2,12 +2,14 @@
 
 set -o errexit -o errtrace
 
-export SNAPSHOT_TARGET="/.snapshots/home-$(date "+%Y-%m-%dT%H:%M:%S")"
 export BORG_REPO="borg@borg1.th73.ovh:."
 export BORG_PASSPHRASE="$(< ~/.borg_secret)"
-export BORG_RSH="ssh -o IdentitiesOnly=yes -i ~/.ssh/borg_key"
+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
+
 cleanup() {
     cd /
     sudo -n /usr/bin/backup-sudo cleanup
@@ -23,8 +25,6 @@ handle_failure() {
 trap cleanup EXIT
 trap handle_failure INT TERM ERR
 
-notify-send "Backup started."
-
 cleanup
 
 backup() {
@@ -49,6 +49,17 @@ 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
+
 for d in /.snapshots/*/ ; do
     echo "Now working on: $d"
     backup "$d"