[Lxc-users] lxc-ubuntu: Only replace i386 by i686 in lxc's config, otherwise debootstrap will fail

[Serge Hallyn]

Quoting Stéphane Graber (stgraber at ubuntu.com):
> 
> Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>

Hi Stéphane, 

could you take a look at the email I sent out late last night,
patch 3/2?  It has a slightly different approach.  You are
right, as it was arch wasn't being done right.  With the patch
3/2, (heck, I'll append it here below) it worked for me for
both i386 and x86_64.  So I'd like to stick with that one if
possible, just bc i've tested it.

Subject: [PATCH 3/2] lxc-ubuntu template: set lxc.arch in config

Otherwise the container works fine, except uname -a reports x86_64,
not i686.

And unfortunately debootstrap and lxc.arch each accept only the
opposite of each other (i386 vs i686) :)

Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
---
 templates/lxc-ubuntu.in |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/templates/lxc-ubuntu.in b/templates/lxc-ubuntu.in
index 0b68e84..41ea90f 100644
--- a/templates/lxc-ubuntu.in
+++ b/templates/lxc-ubuntu.in
@@ -175,6 +175,7 @@ lxc.tty = 4
 lxc.pts = 1024
 lxc.rootfs = $rootfs
 lxc.mount  = $path/fstab
+lxc.arch = $arch
 
 lxc.cgroup.devices.deny = a
 # /dev/null and zero
@@ -397,8 +398,8 @@ trim_container=0
 if [ "$arch" == "x86_64" ]; then arch=amd64
 fi
 
-if [ "$arch" == "i686" ]; then
-    arch=i386
+if [ "$arch" == "i386" ]; then
+    arch=i686
 fi
 
 hostarch=$arch
@@ -418,6 +419,10 @@ do
     esac
 done
 
+if [ "$arch" == "i386" ]; then
+    arch=i686
+fi
+
 if [ ! -z "$clean" -a -z "$path" ]; then
     clean || exit 1
     exit 0
-- 
1.7.4.1