浏览代码

Increase ssh connection timeout to 30 seconds

The previous 5-second timeout causes random errors during compilation
here, increasing it to 30 seconds solves this problem.
tags/0.1
Wladimir J. van der Laan 7 年前
父节点
当前提交
cdb3bb4d43
共有 3 个文件被更改,包括 3 次插入3 次删除
  1. 1
    1
      libexec/copy-from-target
  2. 1
    1
      libexec/copy-to-target
  3. 1
    1
      libexec/on-target

+ 1
- 1
libexec/copy-from-target 查看文件

@@ -47,7 +47,7 @@ if [ $# = 0 ] ; then
fi

if [ -z "$USE_LXC" ]; then
scp $QUIET_FLAG -oConnectTimeout=5 -oNoHostAuthenticationForLocalhost=yes -i ${GITIAN_BASE:-.}/var/id_dsa -P $VM_SSH_PORT -r $TUSER@localhost:$1 $2
scp $QUIET_FLAG -oConnectTimeout=30 -oNoHostAuthenticationForLocalhost=yes -i ${GITIAN_BASE:-.}/var/id_dsa -P $VM_SSH_PORT -r $TUSER@localhost:$1 $2
else
config-lxc
sudo lxc-start -n gitian -f var/lxc.config -- sudo -i -u $TUSER tar -cf - "$1" | tar -C "$2" -xkf -

+ 1
- 1
libexec/copy-to-target 查看文件

@@ -47,7 +47,7 @@ if [ $# = 0 ] ; then
fi

if [ -z "$USE_LXC" ]; then
scp $QUIET_FLAG -r -oConnectTimeout=5 -oNoHostAuthenticationForLocalhost=yes -i ${GITIAN_BASE:-.}/var/id_dsa -P $VM_SSH_PORT $1 $TUSER@localhost:$2
scp $QUIET_FLAG -r -oConnectTimeout=30 -oNoHostAuthenticationForLocalhost=yes -i ${GITIAN_BASE:-.}/var/id_dsa -P $VM_SSH_PORT $1 $TUSER@localhost:$2
else
config-lxc
tar -C `dirname "$1"` -cf - `basename "$1"` | sudo lxc-start -n gitian -f var/lxc.config -- sudo -i -u $TUSER tar -C "$2" -xf -

+ 1
- 1
libexec/on-target 查看文件

@@ -42,7 +42,7 @@ fi
#fi

if [ -z "$USE_LXC" ]; then
ssh -oConnectTimeout=5 -oNoHostAuthenticationForLocalhost=yes -i ${GITIAN_BASE:-.}/var/id_dsa -p $VM_SSH_PORT $TUSER@localhost $*
ssh -oConnectTimeout=30 -oNoHostAuthenticationForLocalhost=yes -i ${GITIAN_BASE:-.}/var/id_dsa -p $VM_SSH_PORT $TUSER@localhost $*
else
config-lxc
if [ $TUSER = "root" ]; then

正在加载...
取消
保存