From: parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 4 Dec 2018 12:44:57 +0000 (+0100)
Subject: ditto
X-Git-Tag: py3ok~38
X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=7b70ba1dda58b1576cdb25bd10706a5eabcdcde4

ditto
---

diff --git a/config.planetlab/runtime.pkgs b/config.planetlab/runtime.pkgs
index 95544627..32d6ec24 100644
--- a/config.planetlab/runtime.pkgs
+++ b/config.planetlab/runtime.pkgs
@@ -7,7 +7,7 @@ package: bind-utils
 package: file
 
 # while runing the tests, try to work around a glitch with yum by running yum=complete-transaction
-package: yum-utils
+package<=f27: yum-utils
 package: psmisc
 package>=f29: NetworkManager
 package>=f29: hostname
diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh
index 2a5518a8..08eb1b47 100755
--- a/lbuild-initvm.sh
+++ b/lbuild-initvm.sh
@@ -43,7 +43,7 @@ PUBLIC_BRIDGE=br0
 VIF_GUEST=eth0
 
 ##########
-FEDORA_MIRROR_BASE="http://mirror.onelab.eu/fedora/"
+FEDORA_MIRROR="http://mirror.onelab.eu/"
 FEDORA_MIRROR_KEYS="http://mirror.onelab.eu/keys/"
 FEDORA_PREINSTALLED="dnf dnf-yum passwd rsyslog vim-minimal dhclient chkconfig rootfiles policycoreutils openssh-server openssh-clients"
 DEBIAN_PREINSTALLED="openssh-server openssh-client"
@@ -186,7 +186,7 @@ function fedora_download() {
       sed -i "s/\$basearch/$arch/g; s/\$releasever/${fedora_release}/g;" $f
     done
 
-    MIRROR_URL=$FEDORA_MIRROR_BASE/releases/${fedora_release}/Everything/$arch/os
+    MIRROR_URL=$FEDORA_MIRROR/fedora/releases/${fedora_release}/Everything/$arch/os
     # since fedora18 the rpms are scattered by first name
     # first try the second version of fedora-release first
     RELEASE_URLS=""
@@ -338,8 +338,7 @@ function fedora_configure_yum () {
     # use mirroring/ stuff instead of a hard-wired config
     local repofile=$lxc_root/etc/yum.repos.d/building.repo
     yumconf_mirrors $repofile ${DIRNAME} $fcdistro \
-        "no-exclusion-in-this-context" \
-        $FEDORA_MIRROR_BASE
+        "" $FEDORA_MIRROR
     # the keys stuff requires adjustment though
     sed -i $repofile -e s,'gpgkey=.*',"gpgkey=${FEDORA_MIRROR_KEYS}/RPM-GPG-KEY-fedora-${fedora_release}-primary,"