From 39d86194a332f493065e70ec9d7e690c74280ee8 Mon Sep 17 00:00:00 2001
From: Simon Paillard <spaillard@debian.org>
Date: Mon, 30 Nov 2009 22:44:40 +0100
Subject: SetupTimeOut is a Debian specific alias for ServerAliveInterval, so
 use the portable name instead

---
 etc/common | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/common b/etc/common
index e579e64..465ab73 100644
--- a/etc/common
+++ b/etc/common
@@ -43,7 +43,7 @@ signal () {
     SSHOPTS=${SSHOPTS/\#/ }
 
     # Defaults we always want, no matter what
-    SSH_OPTIONS="-o user=${USERNAME} -o BatchMode=yes -o SetupTimeOut=45 -o ConnectTimeout=45 -o PasswordAuthentication=no"
+    SSH_OPTIONS="-o user=${USERNAME} -o BatchMode=yes -o ServerAliveInterval=45 -o ConnectTimeout=45 -o PasswordAuthentication=no"
 
     if [ -n "${SSH_OPTS}" ]; then
         SSH_OPTIONS="${SSH_OPTIONS} ${SSH_OPTS}"
@@ -136,7 +136,7 @@ signal () {
 # callback, used by ftpsync
 callback () {
     # Defaults we always want, no matter what
-    SSH_OPTIONS="-o BatchMode=yes -o SetupTimeOut=45 -o ConnectTimeout=45 -o PasswordAuthentication=no"
+    SSH_OPTIONS="-o BatchMode=yes -o ServerAliveInterval=45 -o ConnectTimeout=45 -o PasswordAuthentication=no"
     ssh $SSH_OPTIONS -i "$3" -o"user $1" "$2" callback:${HOSTNAME}
 }
 
-- 
cgit v1.2.3