From d852b24406980e3282026c24cfe51b5540234cb4 Mon Sep 17 00:00:00 2001
From: Per Cederqvist <ceder@lysator.liu.se>
Date: Thu, 18 Oct 2007 12:52:13 +0000
Subject: [PATCH] Make backup-one-task more robust against hung servers.

* backup-one-task: Use BatchMode and ServerAliveInterval when fetching
  the exclude file, to avoid hangs.
---
 ChangeLog       | 6 ++++++
 backup-one-task | 1 +
 2 files changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 1c939e8..a7114a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-18  Per Cederqvist  <ceder@shafan.lysator.liu.se>
+
+	Make backup-one-task more robust against hung servers.
+	* backup-one-task: Use BatchMode and ServerAliveInterval when
+	fetching the exclude file, to avoid hangs.
+
 2007-08-09  Per Cederqvist  <ceder@ryttargardskyrkan.se>
 
 	The "start immediately if the previous backup took more than 24
diff --git a/backup-one-task b/backup-one-task
index d865571..2233065 100755
--- a/backup-one-task
+++ b/backup-one-task
@@ -158,6 +158,7 @@ then
     # Fetch an up-to-date exclude file.
     rm -f "$exclude"
     scp -B -q -i /root/.ssh/backupkey \
+	-o BatchMode=yes -o ServerAliveInterval=120 \
         "$server":"$serverpath"/.lysrdiff-exclude "$exclude" >/dev/null 2>&1
     # Create an emtpy exclude file if non existed on the server.
     touch "$exclude"
-- 
GitLab