[lxc-devel] [PATCH] lxc-fedora: manage secondary architectures
Laurent Vivier
Laurent at vivier.eu
Fri Apr 10 19:14:02 UTC 2015
URL for packages and LiveOS differs from x86, x86_64 and ARM.
This patch allows to select the good mirror URL according to
the architecture.
Primary architecture: http://mirrors.kernel.org/fedora
Secondary architecture: http://mirrors.kernel.org/fedora-secondary
The managed secondary architectures are only ppc64 and s390x,
the secondary architectures for Fedora 20 (the base of initial bootstrap).
Signed-off-by: Laurent Vivier <Laurent at Vivier.EU>
---
templates/lxc-fedora.in | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/templates/lxc-fedora.in b/templates/lxc-fedora.in
index 499685f..e33ba33 100644
--- a/templates/lxc-fedora.in
+++ b/templates/lxc-fedora.in
@@ -586,7 +586,7 @@ Have a beer or a cup of coffee. This will take a bit (~300MB).
# Right now, we are using Fedora 20 for the inial bootstrap.
# We could make this the "current" Fedora rev (F > 15).
- rsync -av mirrors.kernel.org::fedora/releases/20/Fedora/$basearch/os/LiveOS .
+ rsync -av ${mirrorurl}/releases/20/Fedora/$basearch/os/LiveOS .
if [[ 0 == $? ]]
then
@@ -663,8 +663,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 mirrors.kernel.org::fedora/releases/20/Fedora/$basearch/os/Packages/r/rpm-[0-9]* \
- mirrors.kernel.org::fedora/releases/20/Fedora/$basearch/os/Packages/y/yum-[0-9]* .
+ rsync -av ${mirrorurl}/releases/20/Fedora/$basearch/os/Packages/r/rpm-[0-9]* \
+ ${mirrorurl}/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?!?!
@@ -696,7 +696,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 mirrors.kernel.org::fedora/releases/20/Fedora/$basearch/os/Packages/f/fedora-release-20* .
+ rsync -av ${mirrorurl}/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-*
@@ -1232,7 +1232,6 @@ if [ ! -z "$clean" -a -z "$path" ]; then
exit 0
fi
-
basearch=${arch}
# Map a few architectures to their generic Fedora repository archs.
# The two ARM archs are a bit of a guesstimate for the v5 and v6
@@ -1247,6 +1246,12 @@ armv6l|armv7l|armv8l) basearch=armhfp ;;
*) ;;
esac
+mirrorurl="mirrors.kernel.org::fedora"
+case "$basearch" in
+ppc64|s390x) mirrorurl="mirrors.kernel.org::fedora-secondary" ;;
+*) ;;
+esac
+
# Somebody wants to specify an arch. This is very limited case.
# i386/i586/i686 on i386/x86_64
# - or -
--
1.9.1
More information about the lxc-devel
mailing list