From: Stéphane Graber <stgraber@ubuntu.com>
Date: Sun, 19 Jul 2015 03:01:24 +0000 (-0400)
Subject: Fedora 20 no longer exists on the mirrors
X-Git-Tag: lxc-2.0.0.beta1~222
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29be874c4e17de51cd818ed0913acb9f2e67e1ea;p=thirdparty%2Flxc.git

Fedora 20 no longer exists on the mirrors

Switch to Fedora 22 for now.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/templates/lxc-fedora.in b/templates/lxc-fedora.in
index 7faa9398a..e1e5e6011 100644
--- a/templates/lxc-fedora.in
+++ b/templates/lxc-fedora.in
@@ -433,7 +433,7 @@ configure_fedora_systemd()
 #       and then used to build other arbitrary vesions of Fedora of a
 #       given architecture.  Note that this only has to run once for
 #       Fedora on a given architecture since rpm and yum can build other
-#       versions.  We'll arbitrarily pick Fedora 20 to build this.  This
+#       versions.  We'll arbitrarily pick Fedora 22 to build this.  This
 #       will need to change as time goes on.
 
 # Programmers Note...  A future fall back may be to download the netinst
@@ -584,10 +584,10 @@ Have a beer or a cup of coffee.  This will take a bit (~300MB).
 "
         sleep 3 # let him read it...
 
-        # Right now, we are using Fedora 20 for the inial bootstrap.
+        # Right now, we are using Fedora 22 for the inial bootstrap.
         # We could make this the "current" Fedora rev (F > 15).
 
-        rsync -av ${mirrorurl}/releases/20/Fedora/$basearch/os/LiveOS .
+        rsync -av ${mirrorurl}/releases/22/Fedora/$basearch/os/LiveOS .
 
         if [[ 0 == $? ]]
         then
@@ -664,8 +664,8 @@ This will take a couple of minutes.  Patience..."
     # of this LiveOS image we're camped out on.  This is the beginning
     # of the butt ugly hack.  Look close or you may missing it...
 
-    rsync -av ${mirrorurl}/releases/20/Fedora/$basearch/os/Packages/r/rpm-[0-9]* \
-        ${mirrorurl}/releases/20/Fedora/$basearch/os/Packages/y/yum-[0-9]* .
+    rsync -av ${mirrorurl}/releases/22/Fedora/$basearch/os/Packages/r/rpm-[0-9]* \
+        ${mirrorurl}/releases/22/Fedora/$basearch/os/Packages/y/yum-[0-9]* .
 
     # And here it is...
     # The --nodeps is STUPID but F15 had a bogus dependency on RawHide?!?!
@@ -697,7 +697,7 @@ This will take a couple of minutes.  Patience..."
     echo "Stage 1 creation complete.  Building stage 2 Installation Bootstrap"
 
     mount -o bind ../bootstrap run/install
-    rsync -av ${mirrorurl}/releases/20/Fedora/$basearch/os/Packages/f/fedora-release-20* .
+    rsync -av ${mirrorurl}/releases/22/Fedora/$basearch/os/Packages/f/fedora-release-22* .
 
     # The --nodeps is STUPID but F15 had a bogus dependency on RawHide?!?!
     chroot . rpm --root /run/install --nodeps -ivh fedora-release-*
@@ -1351,8 +1351,8 @@ if [ -z "$release" ]; then
     if [ "$is_fedora" -a "$fedora_host_ver" ]; then
         release=$fedora_host_ver
     else
-        echo "This is not a fedora host and release missing, defaulting to 20 use -R|--release to specify release"
-        release=20
+        echo "This is not a fedora host and release missing, defaulting to 22 use -R|--release to specify release"
+        release=22
     fi
 fi