diff options
| author | Tharre <tharre3@gmail.com> | 2018-05-05 22:54:56 +0200 |
|---|---|---|
| committer | Tharre <tharre3@gmail.com> | 2018-05-05 22:54:56 +0200 |
| commit | 486ea833686c70b78133db967a744cc2dd496daf (patch) | |
| tree | 077f3f2fb20805af81979dce7e5313a14a1b06af | |
| parent | 0ad01a049da0ab5d987a856f4aa3d46673d11fc6 (diff) | |
| download | pkgbuilds-486ea833686c70b78133db967a744cc2dd496daf.tar.gz pkgbuilds-486ea833686c70b78133db967a744cc2dd496daf.tar.xz pkgbuilds-486ea833686c70b78133db967a744cc2dd496daf.zip | |
arch-system: borgbackup: check network status
| -rw-r--r-- | arch-system/PKGBUILD | 2 | ||||
| -rwxr-xr-x | arch-system/borgbackup | 19 |
2 files changed, 16 insertions, 5 deletions
diff --git a/arch-system/PKGBUILD b/arch-system/PKGBUILD index da8cb62..88f0be7 100644 --- a/arch-system/PKGBUILD +++ b/arch-system/PKGBUILD @@ -31,7 +31,7 @@ sha256sums=('bb00c42f2802c12536c46700b948d41a43153d97a6986827b7c61203880e1ad1' '99cd268de0e9b847d65f802e7bcbbf7318398a04db61523545d4002ebdfb4d9c' '27a22dfc1904c8c35e3855b4e1a52b96239d390de1c497ea9ab994ef8bd2b52b' 'e1bf3dc5978a7641f86975b7ee770a6914b30a8e4b7e3be2f1b07eaa7098591d' - 'ad3e8af09bfa1084e6ea70cab11088219d609398c61f162cabbf5a524b54783b' + 'fc4fdf70529080cfc22655e4e8214f8f1770172706c3248ed20db4c836492c34' 'b9f38ad0731a5b65d49eaacd0fb8cfe051b6ca7ea68496d89919701842183d89') package_base-system() { 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" |