X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lbuild-initvm.sh;h=e6aa67de73281cc84f2ae856561771b096735953;hb=e63385eee6c8d9b2fcd49dd81d0fe7ce6c5c7954;hp=df78c11fa5388accbb1bd339c8ed2d891b441a8b;hpb=e5b6b489890388a37fb0cbedb349dd6b65b46a6d;p=build.git

diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh
index df78c11f..e6aa67de 100755
--- a/lbuild-initvm.sh
+++ b/lbuild-initvm.sh
@@ -19,6 +19,8 @@ export PATH=$PATH:/bin:/sbin
 
 . build.common
 
+# XXX fixme : when creating a 32bits VM we need to call linux32 as appropriate...s
+
 DEFAULT_FCDISTRO=f20
 DEFAULT_PLDISTRO=lxc
 DEFAULT_PERSONALITY=linux64
@@ -71,7 +73,7 @@ function package_method () {
     fcdistro=$1; shift
     case $fcdistro in
 	f[0-9]*|centos[0-9]*|sl[0-9]*) echo yum ;;
-	squeeze|wheezy|jessie|oneiric|precise|quantal|raring|saucy|trusty) echo debootstrap ;;
+	squeeze|wheezy|jessie|oneiric|precise|quantal|raring|saucy|trusty|utopic) echo debootstrap ;;
 	*) echo Unknown distro $fcdistro ;;
     esac 
 }
@@ -163,10 +165,13 @@ function fedora_download() {
     MIRROR_URL=$FEDORA_MIRROR_BASE/releases/$release/Everything/$arch/os
     RELEASE_URL1="$MIRROR_URL/Packages/fedora-release-$release-1.noarch.rpm"
     # with fedora18 the rpms are scattered by first name
-    RELEASE_URL2="$MIRROR_URL/Packages/f/fedora-release-$release-1.noarch.rpm"
+    # first try the second version of fedora-release first
+    RELEASE_URL2="$MIRROR_URL/Packages/f/fedora-release-$release-2.noarch.rpm"
+    RELEASE_URL3="$MIRROR_URL/Packages/f/fedora-release-$release-1.noarch.rpm"
+   
     RELEASE_TARGET=$INSTALL_ROOT/fedora-release-$release.noarch.rpm
     found=""
-    for attempt in $RELEASE_URL1 $RELEASE_URL2; do
+    for attempt in $RELEASE_URL1 $RELEASE_URL2 $RELEASE_URL3; do
 	if curl -f $attempt -o $RELEASE_TARGET ; then
 	    echo "Retrieved $attempt"
 	    found=true
@@ -214,6 +219,9 @@ function fedora_configure() {
     # set the hostname
     case "$fcdistro" in 
 	f18|f2?)
+            cat <<EOF > ${lxc_root}/etc/sysconfig/network
+NETWORKING=yes
+EOF
 	    cat <<EOF > ${lxc_root}/etc/hostname
 $GUEST_HOSTNAME
 EOF
@@ -272,8 +280,8 @@ function fedora_configure_init() {
     # don't mount devpts, for pete's sake
     sed -i 's/^.*dev.pts.*$/#\0/' ${lxc_root}/etc/rc.sysinit
     sed -i 's/^.*dev.pts.*$/#\0/' ${lxc_root}/etc/rc.d/rc.sysinit
-    chroot ${lxc_root} chkconfig udev-post off
-    chroot ${lxc_root} chkconfig network on
+    chroot ${lxc_root} $personality chkconfig udev-post off
+    chroot ${lxc_root} $personality chkconfig network on
 }
 
 # this code of course is for guests that do run on systemd
@@ -296,7 +304,7 @@ function fedora_configure_systemd() {
     ln -sf /dev/null ${lxc_root}/etc/systemd/system/"getty@.service"
     rm -f ${lxc_root}/etc/systemd/system/getty.target.wants/*service || :
 # can't seem to handle this one with systemctl
-    chroot ${lxc_root} chkconfig network on
+    chroot ${lxc_root} $personality chkconfig network on
 }
 
 # overwrite container yum config
@@ -310,7 +318,7 @@ function fedora_configure_yum () {
     pldistro=$1; shift
 
     # rpm --rebuilddb
-    chroot $lxc_root rpm --rebuilddb
+    chroot ${lxc_root} $personality rpm --rebuilddb
 
     echo "Initializing yum.repos.d in $lxc"
     rm -f $lxc_root/etc/yum.repos.d/*
@@ -363,7 +371,7 @@ function debian_mirror () {
     case $fcdistro in
 	squeeze|wheezy|jessie) 
 	    echo http://ftp2.fr.debian.org/debian/ ;;
-	oneiric|precise|quantal|raring|saucy|trusty) 
+	oneiric|precise|quantal|raring|saucy|trusty|utopic) 
 	    echo http://mir1.ovh.net/ubuntu/ubuntu/ ;;
 	*) echo unknown distro $fcdistro; exit 1;;
     esac
@@ -379,10 +387,10 @@ function debian_install () {
     debootstrap --arch $arch $fcdistro $lxc_root $mirror
     # just like with fedora we ensure a few packages get installed as well
     # not started yet
-    #virsh -c lxc:/// lxc-enter-namespace $lxc /bin/bash -c "apt-get update"
-    #virsh -c lxc:/// lxc-enter-namespace $lxc /bin/bash -c "apt-get -y install $DEBIAN_PREINSTALLED"
-    chroot $lxc_root apt-get update
-    chroot $lxc_root apt-get -y install $DEBIAN_PREINSTALLED
+    #virsh -c lxc:/// lxc-enter-namespace $lxc /usr/bin/$personality /bin/bash -c "apt-get update"
+    #virsh -c lxc:/// lxc-enter-namespace $lxc /usr/bin/$personality /bin/bash -c "apt-get -y install $DEBIAN_PREINSTALLED"
+    chroot ${lxc_root} $personality apt-get update
+    chroot ${lxc_root} $personality apt-get -y install $DEBIAN_PREINSTALLED
     # configure hostname
     cat <<EOF > ${lxc_root}/etc/hostname
 $GUEST_HOSTNAME
@@ -448,9 +456,11 @@ function setup_lxc() {
     # Enable cgroup -- xxx -- is this really useful ?
     [ -d $lxc_root/cgroup ] || mkdir $lxc_root/cgroup
     
-    # set up resolv.conf
+    ### set up resolv.conf from host
+    # ubuntu precise and on, /etc/resolv.conf is a symlink to ../run/resolvconf/resolv.conf
+    [ -h $lxc_root/etc/resolv.conf ] && rm -f $lxc_root/etc/resolv.conf
     cp /etc/resolv.conf $lxc_root/etc/resolv.conf
-    # and /etc/hosts for at least localhost
+    ### and /etc/hosts for at least localhost
     [ -f $lxc_root/etc/hosts ] || echo "127.0.0.1 localhost localhost.localdomain" > $lxc_root/etc/hosts
     
     # grant ssh access from host to guest
@@ -587,22 +597,22 @@ function devel_or_vtest_tools () {
     ### install individual packages, then groups
     # get target arch - use uname -i here (we want either x86_64 or i386)
    
-    lxc_arch=$(chroot $lxc_root uname -i)
+    lxc_arch=$(chroot ${lxc_root} $personality uname -i)
     # on debian systems we get arch through the 'arch' command
-    [ "$lxc_arch" = "unknown" ] && lxc_arch=$(chroot $lxc_root arch)
+    [ "$lxc_arch" = "unknown" ] && lxc_arch=$(chroot ${lxc_root} $personality arch)
 
     packages=$(pl_getPackages -a $lxc_arch $fcdistro $pldistro $pkgsfile)
     groups=$(pl_getGroups -a $lxc_arch $fcdistro $pldistro $pkgsfile)
 
     case "$pkg_method" in
 	yum)
-	    [ -n "$packages" ] && chroot $lxc_root yum -y install $packages
+	    [ -n "$packages" ] && chroot ${lxc_root} $personality yum -y install $packages
 	    for group_plus in $groups; do
 		group=$(echo $group_plus | sed -e "s,+++, ,g")
-		chroot $lxc_root yum -y groupinstall "$group"
+		chroot ${lxc_root} $personality yum -y groupinstall "$group"
 	    done
 	    # store current rpm list in /init-lxc.rpms in case we need to check the contents
-	    chroot $lxc_root rpm -aq > $lxc_root/init-lxc.rpms
+	    chroot ${lxc_root} $personality rpm -aq > $lxc_root/init-lxc.rpms
 	    ;;
 	debootstrap)
 	    # for ubuntu
@@ -617,8 +627,8 @@ function devel_or_vtest_tools () {
 	    fi
 	    for package in $packages ; do
 		# container not started yet
-	        #virsh -c lxc:/// lxc-enter-namespace $lxc /bin/bash -c "apt-get install -y $package" || :
-		chroot $lxc_root apt-get install -y $package || :
+	        #virsh -c lxc:/// lxc-enter-namespace $lxc /usr/bin/$personality /bin/bash -c "apt-get install -y $package" || :
+		chroot ${lxc_root} $personality apt-get install -y $package || :
 	    done
 	    ### xxx todo install groups with apt..
 	    ;;
@@ -640,7 +650,10 @@ function post_install () {
 	if [ -n "$START_VM" ] ; then
 	    virsh -c lxc:/// start $lxc
 	    # manually run dhclient in guest - somehow this network won't start on its own
-            virsh -c lxc:/// lxc-enter-namespace $lxc /bin/bash -c "dhclient $VIF_GUEST"
+	    # we need the --noseclabel flag with recent libvirt's
+	    # was not required with f20/libvirt-1.2.5
+	    # but is now with f21/libvirt-1.2.9
+            virsh -c lxc:/// lxc-enter-namespace --noseclabel $lxc /usr/bin/$personality /bin/bash -c "dhclient $VIF_GUEST"
 	fi
     else
 	post_install_myplc $lxc $personality
@@ -665,7 +678,7 @@ function post_install_build () {
 
 ### From myplc-devel-native.spec
 # be careful to backslash $ in this, otherwise it's the root context that's going to do the evaluation
-    cat << EOF | chroot $lxc_root bash -x
+    cat << EOF | chroot ${lxc_root} $personality bash -x
     
     # customize root's prompt
     /bin/cat << PROFILE > /root/.profile
@@ -685,7 +698,7 @@ function post_install_myplc  () {
     personality=$1; shift
 
 # be careful to backslash $ in this, otherwise it's the root context that's going to do the evaluation
-    cat << EOF | chroot $lxc_root bash -x
+    cat << EOF | chroot ${lxc_root} $personality bash -x
 
     # create /etc/sysconfig/network if missing
     [ -f /etc/sysconfig/network ] || /bin/echo NETWORKING=yes > /etc/sysconfig/network