bootcd branch lxc is gone

[build.git] / vbuild-init-lxc.sh

diff --git a/vbuild-init-lxc.sh b/vbuild-init-lxc.sh
index 0db8b33..def2330 100755 (executable)
--- a/vbuild-init-lxc.sh
+++ b/vbuild-init-lxc.sh
@@ -82,7 +82,8 @@ broadcast=$(/sbin/ip addr show $INTERFACE_LAN | grep -v inet6 | grep inet | head
     sleep 2
     echo "Setting bridge address=$address broadcast=$broadcast"
     # static
-    /sbin/ifconfig $INTERFACE_BRIDGE $address broadcast $broadcast up
+    #/sbin/ifconfig $INTERFACE_BRIDGE $address broadcast $broadcast up
+    dhclient $INTERFACE_BRIDGE
     sleep 1
 
     #Reconfigure the routing table
@@ -147,12 +148,11 @@ function prepare_host() {
     check_yum_installed libvirt
 
     #retrieve and install lxc from sources 
-    #raw_version=$(lxc-version ||: )
-    #lxc_installed_version=$(echo $raw_version | sed -e 's,.*: ,,')
-    #if [ "$lxc_installed_version" != "$lxc_version" ] ; then
-    if [ ! -f /usr/bin/lxc-ls ] ; then
-       #echo "Expecting version" '['$lxc_version']'
-       #echo "Found version" '['$lxc_installed_version']'
+    raw_version=$(lxc-version ||: )
+    lxc_installed_version=$(echo $raw_version | sed -e 's,.*: ,,')
+    if [ "$lxc_installed_version" != "$lxc_version" ] ; then
+       echo "Expecting version" '['$lxc_version']'
+       echo "Found version" '['$lxc_installed_version']'
         echo "Installing lxc ..."
         cd /root
        [ -d lxc ] || git clone git://lxc.git.sourceforge.net/gitroot/lxc/lxc 
@@ -563,13 +563,16 @@ function setup_lxc() {
 
     echo $IP is up, waiting for ssh...
 
-    
+    # wait max 5 min for sshd to start 
     ssh_up=""
+    stop_time=$(($(date +%s) + 300))
+    current_time=$(date +%s)
 
-    while true; do
+    while [ "$current_time" -lt "$stop_time" ] ; do
          echo "ssh attempt ..."
          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))
     done
 
     [ -z $ssh_up ] && echo "SSHD in container $lxc is not running"