From: Michael H. Warfield <mhw@WittsEnd.com>
Date: Wed, 2 Apr 2014 20:54:39 +0000 (-0400)
Subject: Added lxc.arch to configuration files for CentOS and Fedora
X-Git-Tag: lxc-1.0.3~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24073c8f0ec5fca76c0ac828a0564cd67e609383;p=thirdparty%2Flxc.git

Added lxc.arch to configuration files for CentOS and Fedora

Added lxc.arch to the resulting container configuration files
to support i686 on x86_64 cross arch containers.

Signed-off-by: Michael H. Warfield <mhw@WittsEnd.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/templates/lxc-centos.in b/templates/lxc-centos.in
index 6d9e512a2..7b83b8ebb 100644
--- a/templates/lxc-centos.in
+++ b/templates/lxc-centos.in
@@ -590,6 +590,7 @@ lxc.include = @LXCTEMPLATECONFIG@/centos.common.conf
 
     # Append things which require expansion here...
     cat <<EOF >> $config_path/config
+lxc.arch = $arch
 lxc.utsname = $utsname
 
 lxc.autodev = $auto_dev
diff --git a/templates/lxc-fedora.in b/templates/lxc-fedora.in
index 16f0c55e1..27aeeb0ec 100644
--- a/templates/lxc-fedora.in
+++ b/templates/lxc-fedora.in
@@ -1076,6 +1076,7 @@ lxc.include = @LXCTEMPLATECONFIG@/fedora.common.conf
 
     # Append things which require expansion here...
     cat <<EOF >> $config_path/config
+lxc.arch = $arch
 lxc.utsname = $utsname
 
 lxc.autodev = $auto_dev