lxc build to use lxc branch of bootcd

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

diff --git a/vbuild-init-lxc.sh b/vbuild-init-lxc.sh
index 85ce182..4f0bdac 100755 (executable)
--- a/vbuild-init-lxc.sh
+++ b/vbuild-init-lxc.sh
@@ -5,6 +5,7 @@
 
 COMMAND=$(basename $0)
 DIRNAME=$(dirname $0)
+BUILD_DIR=$(pwd)
 
 # pkgs parsing utilities
 PATH=$(dirname $0):$PATH export PATH
@@ -146,20 +147,25 @@ 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
-       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
+    if [ ! -f /usr/bin/lxc-ls ] ; then
+       #echo "Expecting version" '['$lxc_version']'
+       #echo "Found version" '['$lxc_installed_version']'
         echo "Installing lxc ..."
         cd /root
-        git clone git://lxc.git.sourceforge.net/gitroot/lxc/lxc 
+       [ -d lxc ] || git clone git://lxc.git.sourceforge.net/gitroot/lxc/lxc 
         cd lxc
+       git pull
        git checkout $lxc_version
         ./autogen.sh
-        ./configure --prefix=/usr
+        ./configure --prefix=/usr --exec-prefix=/usr
         make
         make install
+        mkdir -p /usr/var/lib/
+        [ -d /usr/var/lib/lxc ] || ln -s /var/lib/lxc /usr/var/lib/lxc
+       cd $BUILD_DIR
     fi
  
 #    #create a placeholder (just a hack to make lxc works)
@@ -171,7 +177,7 @@ function prepare_host() {
     isInstalled=$(netstat -rn | grep '^0.0.0.0' | awk '{print $8;}')
     if [ "$isInstalled" != "br0" ] ; then
        bridge_init
-        sleep5
+        sleep 5
     fi
 
     return 0
@@ -375,6 +381,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
@@ -549,9 +556,27 @@ 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
+    lxc-wait -n $lxc -s RUNNING
+
+    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
@@ -823,7 +848,10 @@ function main () {
         echo "Unknown personality: $personality"
     fi
 
-    
+    # need lxc installed before we can run lxc-ls
+    # need bridge installed
+    prepare_host    
+
     if [ -n "$VBUILD_MODE" ] ; then
 
        # Bridge IP affectation
@@ -837,6 +865,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
@@ -846,6 +875,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)
@@ -856,22 +886,16 @@ function main () {
           exit 1
     fi
 
-    # need lxc installed before we can run lxc-ls
-    prepare_host
-    
-    if [ ! -z "$(lxc-ls | grep $lxc)" ];then
-        echo "container $lxc exists"
-        exit 1
-    fi
-
-    
     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