From: Mohamed Larabi <mohamed.larabi@inria.fr>
Date: Tue, 10 Apr 2012 13:51:22 +0000 (+0200)
Subject: lxc version checkout and dhcp the bridging
X-Git-Tag: 5.0-rc27~55
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8163842e1cd463d9685fb141a7380e68a9dcadcb;p=build.git

lxc version checkout and dhcp the bridging
---

diff --git a/vbuild-init-lxc.sh b/vbuild-init-lxc.sh
index 4f0bdacd..def2330e 100755
--- 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