From f71e8f41fb129043323b13290c6697d27e603335 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Graber?= Date: Sat, 18 Jul 2015 23:42:00 -0400 Subject: [PATCH] lxc-fedora: Default to 22 but use 20 squashfs MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The Fedora 22 squashfs doesn't appear to work, the Fedora 21 isn't available, so lets use the fedora archive mirror and pull the good old Fedora 20 squashfs. Signed-off-by: Stéphane Graber --- templates/lxc-fedora.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/lxc-fedora.in b/templates/lxc-fedora.in index e1e5e6011..6d08c89ad 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 22 to build this. This +# versions. We'll arbitrarily pick Fedora 20 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 22 for the inial bootstrap. + # Right now, we are using Fedora 20 for the inial bootstrap. # We could make this the "current" Fedora rev (F > 15). - rsync -av ${mirrorurl}/releases/22/Fedora/$basearch/os/LiveOS . + rsync -av ${mirrorurl}/fedora/linux/releases/20/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/22/Fedora/$basearch/os/Packages/r/rpm-[0-9]* \ - ${mirrorurl}/releases/22/Fedora/$basearch/os/Packages/y/yum-[0-9]* . + rsync -av ${mirrorurl}/fedora/linux/releases/20/Fedora/$basearch/os/Packages/r/rpm-[0-9]* \ + ${mirrorurl}/fedora/linux/releases/20/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/22/Fedora/$basearch/os/Packages/f/fedora-release-22* . + rsync -av ${mirrorurl}/fedora/linux/releases/20/Fedora/$basearch/os/Packages/f/fedora-release-20* . # The --nodeps is STUPID but F15 had a bogus dependency on RawHide?!?! chroot . rpm --root /run/install --nodeps -ivh fedora-release-* @@ -1247,9 +1247,9 @@ armv6l|armv7l|armv8l) basearch=armhfp ;; *) ;; esac -mirrorurl="mirrors.kernel.org::fedora" +mirrorurl="archives.fedoraproject.org::fedora-archive" case "$basearch" in -ppc64|s390x) mirrorurl="mirrors.kernel.org::fedora-secondary" ;; +ppc64|s390x) mirrorurl="archives.fedoraproject.org::fedora-secondary" ;; *) ;; esac -- 2.47.2