From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Sat, 2 Mar 2013 08:07:24 +0000 (+0100)
Subject: get vbuild-init-lxc to exit with error if sshd cannot be reached in the container
X-Git-Tag: 5.2.1~18
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=58ef5dce2804a1110aebbdf303df2a44060dbd33;p=build.git

get vbuild-init-lxc to exit with error if sshd cannot be reached in the container
---

diff --git a/vbuild-init-lxc.sh b/vbuild-init-lxc.sh
index 9e1dd8b8..240a6b37 100755
--- a/vbuild-init-lxc.sh
+++ b/vbuild-init-lxc.sh
@@ -591,15 +591,17 @@ function setup_lxc() {
     ssh_up=""
     stop_time=$(($(date +%s) + 300))
     current_time=$(date +%s)
-
+    counter=1
     while [ "$current_time" -lt "$stop_time" ] ; do
-         echo "ssh attempt ..."
+         echo "$counter-th attempt to reach sshd in container $lxc ..."
          ssh -o "StrictHostKeyChecking no" $IP 'uname -i' && { ssh_up=true; echo "SSHD in container $lxc is UP"; break ; } || :
          sleep 10
          current_time=$(($current_time + 10))
+	 counter=$(($counter+1))
     done
 
-    [ -z $ssh_up ] && echo "SSHD in container $lxc is not running"
+    # Thierry: this is fatal, let's just exit with a failure here
+    [ -z $ssh_up ] && { echo "SSHD in container $lxc is not running" ; exit 1 ; }
    
     # rpm --rebuilddb
     chroot $rootfs_path rpm --rebuilddb