X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vbuild-init-lxc.sh;h=7450a8980e1e7aa1779984412c1ede32f4cf537d;hb=026a6adb149d0520c85826478ad5aafe7ea88410;hp=97aad9efbec2163256f835eb44184c0a84dc3e7e;hpb=3d7c1e1b0e1aeb7b631883af2ea549443ade8e2e;p=build.git

diff --git a/vbuild-init-lxc.sh b/vbuild-init-lxc.sh
index 97aad9ef..7450a898 100755
--- a/vbuild-init-lxc.sh
+++ b/vbuild-init-lxc.sh
@@ -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 () {
 
@@ -82,7 +83,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,15 +149,14 @@ 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 
+	[ -d lxc ] || git clone "$lxc_git_repo"
         cd lxc
 	git pull
 	git checkout $lxc_version
@@ -381,6 +382,7 @@ lxc.network.link = $lxc_network_link
 lxc.network.name = $IFNAME
 lxc.network.mtu = 1500
 lxc.network.ipv4 = $IP/$CIDR
+lxc.network.veth.pair = $veth_pair
 #cgroups
 #lxc.cgroup.devices.deny = a
 # /dev/null and zero
@@ -555,9 +557,25 @@ function setup_lxc() {
     mkdir $rootfs_path/root/.ssh
     cat /root/.ssh/id_rsa.pub >> $rootfs_path/root/.ssh/authorized_keys
     
+    # start container
     lxc-start -d -n $lxc
 
-    sleep 20
+    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 [ "$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"
+     
 
     # rpm --rebuilddb
     chroot $rootfs_path rpm --rebuilddb
@@ -846,6 +864,7 @@ function main () {
 	
         lxc_network_type=veth
         lxc_network_link=virbr0
+	veth_pair="veth$z"
         echo "the IP address of container $lxc is $IP "
     else
         [[ -z "$REPO_URL" ]] && usage
@@ -855,6 +874,7 @@ function main () {
         [[ -z "$HOSTNAME" ]] && usage
         lxc_network_type=veth
         lxc_network_link=br0
+        veth_pair="i$(echo $HOSTNAME | cut -d. -f1)"
     fi
 
     CIDR=$(cidr_notation $NETMASK)
@@ -865,17 +885,16 @@ function main () {
           exit 1
     fi
 
-    # be strict on lxc-lines matching name exactly using ^<name>$
-    # as otherwise the timestamps may show up here
-    lxc-ls | grep -q '^'"$lxc"'$' && { echo "container $lxc already exists - exiting" ; exit 1 ; }
-    
     path=/var/lib/lxc
     rootfs_path=$path/$lxc/rootfs
     config_path=$path/$lxc
     cache_base=/var/cache/lxc/fedora/$arch
     cache=$cache_base/$release
     root_password=root
-
+    
+    # check whether the rootfs directory is created to know if the container exists
+    # bacause /var/lib/lxc/$lxc is already created while putting $lxc.timestamp
+    [ -d $rootfs_path ] && { echo "container $lxc already exists - exiting" ; exit 1 ; }
 
     setup_lxc $lxc $fcdistro $pldistro $personality