[lxc-devel] [lxc/master] fedora: Fix i386 handling

[stgraber on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 354 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20170322/2e651783/attachment.bin>
-------------- next part --------------
From e8672a9d71a2719201496ba45d6e2c1b6d17f40f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Wed, 22 Mar 2017 17:18:47 -0400
Subject: [PATCH] fedora: Fix i386 handling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 templates/lxc-fedora.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/lxc-fedora.in b/templates/lxc-fedora.in
index 776ea68..44e7cef 100644
--- a/templates/lxc-fedora.in
+++ b/templates/lxc-fedora.in
@@ -221,7 +221,7 @@ to force a new download.
     CHROOT_DIR="$(pwd)"
     CHROOT_CMD="chroot ${CHROOT_DIR} "
     INSTALL_ROOT="/"
-    if ! setup_repositories "${cache}" "${arch}" "${FEDORA_RELEASE_DEFAULT}" "${mirror}"
+    if ! setup_repositories "${cache}" "${basearch}" "${FEDORA_RELEASE_DEFAULT}" "${mirror}"
     then
         echo "Error: Failed to configure repositories in ${CHROOT_DIR}${INSTALL_ROOT}"
         exit 1
@@ -938,7 +938,7 @@ Template specific options can be passed to lxc-create after a '--' like this:
 
 Template options:
 
-  -a, --arch             Define what arch the container will be [i686,x86_64]
+  -a, --arch             Define what arch the container will be [i386,x86_64]
   -c, --clean            Clean bootstrap and download cache
   -d, --debug            Run with 'set -x' to debug errors
       --fqdn             Fully qualified domain name (FQDN)