Browse Source

Merge pull request #38 from laanwj/master

Increase ssh timeout to 30 seconds
pull/40/head
Dev Random 9 years ago
parent
commit
3c6379e89e
  1. 2
      libexec/copy-from-target
  2. 2
      libexec/copy-to-target
  3. 2
      libexec/on-target

2
libexec/copy-from-target

@ -47,7 +47,7 @@ if [ $# = 0 ] ; then @@ -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 -

2
libexec/copy-to-target

@ -47,7 +47,7 @@ if [ $# = 0 ] ; then @@ -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 -

2
libexec/on-target

@ -42,7 +42,7 @@ fi @@ -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

Loading…
Cancel
Save