Merge branch 'master' of ssh://git.onelab.eu/git/build

diff --combined vbuild-init-lxc.sh
index cb3c208,f688f24..7450a89
--- 1/vbuild-init-lxc.sh
--- 2/vbuild-init-lxc.sh
+++ b/vbuild-init-lxc.sh
@@@ -20,7 -20,6 +20,7 @@@ COMMAND_VBUILD="vbuild-init-lxc.sh
  COMMAND_MYPLC="vtest-init-lxc.sh"
  
  lxc_version="0.8.0-rc2"
 +lxc_git_repo="git://lxc.git.sourceforge.net/gitroot/lxc/lxc"
  
  function bridge_init () {
  
@@@ -156,7 -155,7 +156,7 @@@ function prepare_host() 
        echo "Found version" '['$lxc_installed_version']'
          echo "Installing lxc ..."
          cd /root
 -      [ -d lxc ] || git clone git://lxc.git.sourceforge.net/gitroot/lxc/lxc 
 +      [ -d lxc ] || git clone "$lxc_git_repo"
          cd lxc
        git pull
        git checkout $lxc_version
@@@ -560,8 -559,6 +560,6 @@@ function setup_lxc() 
      # start container
      lxc-start -d -n $lxc
  
-     lxc-wait -n $lxc -s RUNNING
- 
      echo $IP is up, waiting for ssh...
  
      # wait max 5 min for sshd to start