From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Mon, 14 Apr 2014 07:59:01 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build
X-Git-Tag: 5.3.5~19
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1860e024a5ece5339e3aca5b7592473f2e56b210;hp=a561da515a8c0895700fb5af968b74c16b72ab54;p=build.git

Merge branch 'master' of ssh://git.onelab.eu/git/build
---

diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh
index 39d65184..17486d30 100755
--- a/lbuild-initvm.sh
+++ b/lbuild-initvm.sh
@@ -33,6 +33,7 @@ VIF_GUEST=eth0
 
 ##########
 FEDORA_MIRROR_BASE="http://mirror.onelab.eu/fedora/"
+FEDORA_MIRROR_KEYS="http://mirror.onelab.eu/keys/"
 FEDORA_PREINSTALLED="yum initscripts passwd rsyslog vim-minimal dhclient chkconfig rootfiles policycoreutils openssh-server openssh-clients"
 DEBIAN_PREINSTALLED="openssh-server openssh-client"
 
@@ -321,7 +322,7 @@ baseurl=$FEDORA_MIRROR_BASE/releases/\$releasever/Everything/\$basearch/os/
 enabled=1
 metadata_expire=7d
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-\$releasever-\$basearch
+gpgkey=$FEDORA_MIRROR_KEYS/RPM-GPG-KEY-fedora-$release-primary
 
 [updates]
 name=Fedora \$releasever - \$basearch - Updates
@@ -329,7 +330,7 @@ baseurl=$FEDORA_MIRROR_BASE/updates/\$releasever/\$basearch/
 enabled=1
 metadata_expire=7d
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-\$releasever-\$basearch
+gpgkey=$FEDORA_MIRROR_KEYS/keys/RPM-GPG-KEY-fedora-$release-primary
 EOF
 
     # for using vtest-init-lxc.sh as a general-purpose lxc creation wrapper