From: parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 4 Dec 2018 12:30:47 +0000 (+0100)
Subject: build container with a set of repos based on mirroring/ instead of a hardwired list
X-Git-Tag: py3ok~39
X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=3f1f3cef6af76e307e1c5241363b41ab41b4a249

build container with a set of repos based on mirroring/ instead of a hardwired list
---

diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh
index 9cc3fb5f..2a5518a8 100755
--- a/lbuild-initvm.sh
+++ b/lbuild-initvm.sh
@@ -335,23 +335,13 @@ function fedora_configure_yum () {
     echo "Initializing yum.repos.d in $lxc"
     rm -f $lxc_root/etc/yum.repos.d/*
 
-    cat > $lxc_root/etc/yum.repos.d/building.repo <<EOF
-[fedora]
-name=Fedora \$releasever - \$basearch
-baseurl=$FEDORA_MIRROR_BASE/releases/\$releasever/Everything/\$basearch/os/
-enabled=1
-metadata_expire=7d
-gpgcheck=1
-gpgkey=$FEDORA_MIRROR_KEYS/RPM-GPG-KEY-fedora-${fedora_release}-primary
-
-[updates]
-name=Fedora \$releasever - \$basearch - Updates
-baseurl=$FEDORA_MIRROR_BASE/updates/\$releasever/\$basearch/
-enabled=1
-metadata_expire=7d
-gpgcheck=1
-gpgkey=$FEDORA_MIRROR_KEYS/RPM-GPG-KEY-fedora-${fedora_release}-primary
-EOF
+    # 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
+    # the keys stuff requires adjustment though
+    sed -i $repofile -e s,'gpgkey=.*',"gpgkey=${FEDORA_MIRROR_KEYS}/RPM-GPG-KEY-fedora-${fedora_release}-primary,"
 
     # import fedora key so that gpgckeck does not whine or require stdin
     # required since fedora24