From: Michael H. Warfield Date: Mon, 25 Nov 2013 17:30:38 +0000 (-0500) Subject: Fix stupid architecture error. X-Git-Tag: lxc-1.0.0.beta1~95 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a59920b640e89b4b12a47175b5cbb68a48a9289;p=thirdparty%2Flxc.git Fix stupid architecture error. From 38cfabdbe0e46f5a0ed20687fcda48424b4a7b6d Mon Sep 17 00:00:00 2001 From: "Michael H. Warfield" Date: Mon, 25 Nov 2013 10:34:48 -0500 Subject: [PATCH 1/2] Fix stupid architecture error. Organization: Thaumaturgy & Speculums Technology Fix stupid architecture error. Stupid error and I did it! Fixed hard coded x86_64 in several spots. Signed-off-by: Michael H. Warfield Acked-by: Stéphane Graber --- diff --git a/templates/lxc-fedora.in b/templates/lxc-fedora.in index eaa7ce479..d467d2cc8 100644 --- a/templates/lxc-fedora.in +++ b/templates/lxc-fedora.in @@ -412,7 +412,7 @@ Have a beer or a cup of coffee. This will take a bit (~300MB). # Right now, we are using Fedora 19 for the inial bootstrap. # We could make this the "current" Fedora rev (F > 15). - rsync -av mirrors.kernel.org::fedora/releases/19/Fedora/x86_64/os/LiveOS . + rsync -av mirrors.kernel.org::fedora/releases/19/Fedora/$arch/os/LiveOS . if [[ 0 == $? ]] then @@ -489,8 +489,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/19/Fedora/x86_64/os/Packages/r/rpm-[0-9]* \ - mirrors.kernel.org::fedora/releases/19/Fedora/x86_64/os/Packages/y/yum-[0-9]* . + rsync -av mirrors.kernel.org::fedora/releases/19/Fedora/$arch/os/Packages/r/rpm-[0-9]* \ + mirrors.kernel.org::fedora/releases/19/Fedora/$arch/os/Packages/y/yum-[0-9]* . # And here it is... # The --nodeps is STUPID but F15 had a bogus dependency on RawHide?!?! @@ -522,7 +522,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/19/Fedora/x86_64/os/Packages/f/fedora-release-19* . + rsync -av mirrors.kernel.org::fedora/releases/19/Fedora/$arch/os/Packages/f/fedora-release-19* . # The --nodeps is STUPID but F15 had a bogus dependency on RawHide?!?! chroot . rpm --root /run/install --nodeps -ivh fedora-release-*