From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 3 Apr 2012 07:02:06 +0000 (+0200)
Subject: waiting for ssh : beware of set -e
X-Git-Tag: 5.0-rc27~63
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6f9032cb9d2d996db3069906359fe2b008068ff4;p=build.git

waiting for ssh : beware of set -e
---

diff --git a/vbuild-init-lxc.sh b/vbuild-init-lxc.sh
index e29c5335..7ef85262 100755
--- a/vbuild-init-lxc.sh
+++ b/vbuild-init-lxc.sh
@@ -560,11 +560,12 @@ function setup_lxc() {
 
     lxc-wait -n $lxc -s RUNNING
 
-    for i in $(seq 1 5); do
-        echo "ssh ..."
-        ssh_up=$(ssh -o "StrictHostKeyChecking no" $IP 'uname -i')
-        [ -n $ssh_up ] && break
-	sleep 3
+    echo $IP is up, waiting for ssh...
+
+    for i in $(seq 1 10); do
+        echo "ssh attempt $i ..."
+        ssh -o "StrictHostKeyChecking no" $IP 'uname -i' && break || :
+	sleep 2
     done
 
     [ -z $ssh_up ] && echo "SSHD in container $lxc is not running"