xenial

[build.git] / lbuild-initvm.sh

diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh
index 0d22f49..75cb312 100755 (executable)
--- a/lbuild-initvm.sh
+++ b/lbuild-initvm.sh
@@ -83,7 +83,7 @@ function package_method () {
     case $fcdistro in
        f[0-9]*|centos[0-9]*|sl[0-9]*)
            echo yum ;;
-       wheezy|jessie|precise|trusty|utopic|vivid|wily)
+       wheezy|jessie|precise|trusty|utopic|vivid|wily|xenial)
            echo debootstrap ;;
        *)
            echo Unknown distro $fcdistro ;;
@@ -394,7 +394,7 @@ function debian_mirror () {
     case $fcdistro in
        wheezy|jessie) 
            echo http://ftp2.fr.debian.org/debian/ ;;
-       precise|trusty|utopic|vivid|wily) 
+       precise|trusty|utopic|vivid|wily|xenial) 
 #          echo http://mir1.ovh.net/ubuntu/ubuntu/ ;;
            echo http://www-ftp.lip6.fr/pub/linux/distributions/Ubuntu/archive/ ;;
        *) echo unknown distro $fcdistro; exit 1;;
@@ -465,6 +465,11 @@ function setup_lxc() {
        yum)
             if [ -z "$IMAGE" ]; then
                 fedora_install $lxc ||  { echo "failed to install fedora root image"; exit 1 ; }
+               # this appears to be safer; observed in Jan. 2016 on a f23 host and a f14 cached image
+               # we were getting this message when attempting the first chroot yum install
+               # rpmdb: Program version 4.8 doesn't match environment version 5.3
+               chroot $(lxcroot $lxc) $personality rm -rf /var/lib/rpm/__db.00{0,1,2,3,4,5,6,7,8,9}
+               chroot $(lxcroot $lxc) $personality rpm --rebuilddb
             fi
            fedora_configure $lxc || { echo "failed to configure fedora for a container"; exit 1 ; }
            ;;