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.1.0.alpha1~171
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e13923c71155453c856f423e15bdec11d92039fa;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 238159a4d..21fad854f 100644
--- a/templates/lxc-centos.in
+++ b/templates/lxc-centos.in
@@ -600,6 +600,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 5414b4ef8..2e14cc884 100644
--- a/templates/lxc-fedora.in
+++ b/templates/lxc-fedora.in
@@ -1086,6 +1086,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