Skip to content

L
lxc
Commit e97aa817 by Laurent Vivier Committed by Stéphane Graber
Options

lxc-fedora: manage secondary architectures

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: 's avatarLaurent Vivier <Laurent@Vivier.EU> Acked-by: 's avatarSerge E. Hallyn <serge.hallyn@ubuntu.com>
parent e438ef7c
Showing with 10 additions and 5 deletions
templates/lxc-fedora.in
...@@ -586,7 +586,7 @@ Have a beer or a cup of coffee. This will take a bit (~300MB). ...@@ -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. # Right now, we are using Fedora 20 for the inial bootstrap.
# We could make this the "current" Fedora rev (F > 15). # 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 == $? ]] if [[ 0 == $? ]]
then then
...@@ -663,8 +663,8 @@ This will take a couple of minutes. Patience..." ...@@ -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 this LiveOS image we're camped out on. This is the beginning
# of the butt ugly hack. Look close or you may missing it... # 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]* \ rsync -av ${mirrorurl}/releases/20/Fedora/$basearch/os/Packages/r/rpm-[0-9]* \
mirrors.kernel.org::fedora/releases/20/Fedora/$basearch/os/Packages/y/yum-[0-9]* . ${mirrorurl}/releases/20/Fedora/$basearch/os/Packages/y/yum-[0-9]* .
# And here it is... # And here it is...
# The --nodeps is STUPID but F15 had a bogus dependency on RawHide?!?! # The --nodeps is STUPID but F15 had a bogus dependency on RawHide?!?!
...@@ -696,7 +696,7 @@ This will take a couple of minutes. Patience..." ...@@ -696,7 +696,7 @@ This will take a couple of minutes. Patience..."
echo "Stage 1 creation complete. Building stage 2 Installation Bootstrap" echo "Stage 1 creation complete. Building stage 2 Installation Bootstrap"
mount -o bind ../bootstrap run/install 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?!?! # The --nodeps is STUPID but F15 had a bogus dependency on RawHide?!?!
chroot . rpm --root /run/install --nodeps -ivh fedora-release-* chroot . rpm --root /run/install --nodeps -ivh fedora-release-*
...@@ -1232,7 +1232,6 @@ if [ ! -z "$clean" -a -z "$path" ]; then ...@@ -1232,7 +1232,6 @@ if [ ! -z "$clean" -a -z "$path" ]; then
exit 0 exit 0
fi fi
basearch=${arch} basearch=${arch}
# Map a few architectures to their generic Fedora repository archs. # 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 # The two ARM archs are a bit of a guesstimate for the v5 and v6
...@@ -1247,6 +1246,12 @@ armv6l|armv7l|armv8l) basearch=armhfp ;; ...@@ -1247,6 +1246,12 @@ armv6l|armv7l|armv8l) basearch=armhfp ;;
*) ;; *) ;;
esac 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. # Somebody wants to specify an arch. This is very limited case.
# i386/i586/i686 on i386/x86_64 # i386/i586/i686 on i386/x86_64
# - or - # - or -
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment