X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lbuild-initvm.sh;h=35e4c388a2a2257874f69c6ee710a86ce17f8a74;hb=8ddb497d444f08301531efe5b2d9c09e7df66d55;hp=636fdc4f305c36d481bd510ba6460e3fe87e5098;hpb=77cf7bccd1980c4fb1208a730e4ad53382c16274;p=build.git

diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh
index 636fdc4f..35e4c388 100755
--- a/lbuild-initvm.sh
+++ b/lbuild-initvm.sh
@@ -82,7 +82,7 @@ function package_method () {
     case $fcdistro in
         f[0-9]*|centos[0-9]*|sl[0-9]*)
             echo dnf ;;
-        wheezy|jessie|precise|trusty|utopic|vivid|wily|xenial)
+        wheezy|jessie|trusty|xenial|bionic)
             echo debootstrap ;;
         *)
             echo Unknown distro $fcdistro ;;
@@ -375,7 +375,7 @@ function debian_mirror () {
     case $fcdistro in
         wheezy|jessie)
             echo http://ftp2.fr.debian.org/debian/ ;;
-        precise|trusty|utopic|vivid|wily|xenial)
+        trusty|xenial|bionic)
             echo http://www-ftp.lip6.fr/pub/linux/distributions/Ubuntu/archive/ ;;
         *) echo unknown distro $fcdistro; exit 1;;
     esac
@@ -787,11 +787,10 @@ function wait_for_ssh () {
         [ -z "$guest_ip" ] && guest_ip=$(guest_ipv4 $lxc)
         [ -n "$guest_ip" ] && ssh -o "StrictHostKeyChecking no" $guest_ip 'uname -i' && {
             success=true; echo "SSHD in container $lxc is UP on IP $guest_ip"; break ; } || :
-        # when migrating, sometimes we don't have the same uid/gid mapping
-        # for the ssh_keys group on both host boxes...
-        # also this is not wuite right, as *_key gets expanded in the host context
-        # but using "" or \ makes it litteral...
-        virsh -c lxc:/// lxc-enter-namespace $lxc /usr/bin/env chown root:ssh_keys /etc/ssh/*_key
+        # some of our boxes have gone through a long upgrade historically, and
+        # so they don't end up with the same gid mapping for the ssh_keys
+        # group as the ones in the guest that result from a fresh install
+        virsh -c lxc:/// lxc-enter-namespace $lxc /bin/bash -c "chown root:ssh_keys /etc/ssh/*_key" || :
         counter=$(($counter+1))
         sleep 10
         current_time=$(date +%s)