From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 18 Dec 2014 15:44:41 +0000 (+0100)
Subject: for f21, add a third candidate to locate the fedora-release rpm when scaffolding... 
X-Git-Tag: 5.3.7~27
X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=015e930f2db1101985e6c3c3ccf03473df33dcf1

for f21, add a third candidate to locate the fedora-release rpm when scaffolding a root image
---

diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh
index 85c1f82a..e9c13e6a 100755
--- a/lbuild-initvm.sh
+++ b/lbuild-initvm.sh
@@ -166,9 +166,12 @@ function fedora_download() {
     RELEASE_URL1="$MIRROR_URL/Packages/fedora-release-$release-1.noarch.rpm"
     # with fedora18 the rpms are scattered by first name
     RELEASE_URL2="$MIRROR_URL/Packages/f/fedora-release-$release-1.noarch.rpm"
+    # with fedora21 somehow this one came numbered -2
+    RELEASE_URL2="$MIRROR_URL/Packages/f/fedora-release-$release-2.noarch.rpm"
+   
     RELEASE_TARGET=$INSTALL_ROOT/fedora-release-$release.noarch.rpm
     found=""
-    for attempt in $RELEASE_URL1 $RELEASE_URL2; do
+    for attempt in $RELEASE_URL1 $RELEASE_URL2 $RELEASE_URL3; do
 	if curl -f $attempt -o $RELEASE_TARGET ; then
 	    echo "Retrieved $attempt"
 	    found=true