summaryrefslogtreecommitdiff
path: root/etc/common
diff options
context:
space:
mode:
authorSimon Paillard <spaillard@debian.org>2009-11-30 22:44:40 +0100
committerSimon Paillard <spaillard@debian.org>2009-11-30 22:44:40 +0100
commit39d86194a332f493065e70ec9d7e690c74280ee8 (patch)
treed7c8419077a6b3a586f6d98c29f53d6f26565db8 /etc/common
parent1f7c4ddc2798e51043a609f5332d4bb7478d48d5 (diff)
SetupTimeOut is a Debian specific alias for ServerAliveInterval, so use the portable name instead
Diffstat (limited to 'etc/common')
-rw-r--r--etc/common4
1 files 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}
}