From: David Noyes <david.noyes@plus.net>
Date: Wed, 26 Aug 2015 13:18:49 +0000 (+0100)
Subject: Test dpkg for multiarch support in lxc-debian template
X-Git-Tag: lxc-2.0.0.beta1~165^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28e58a6a4fc22a15e01b34874b5f8e9486e25e42;p=thirdparty%2Flxc.git

Test dpkg for multiarch support in lxc-debian template

Signed-off-by: David Noyes <david.j.noyes@gmail.com>
---

diff --git a/templates/lxc-debian.in b/templates/lxc-debian.in
index 39146054c..50e623208 100644
--- a/templates/lxc-debian.in
+++ b/templates/lxc-debian.in
@@ -381,6 +381,12 @@ EOF
     if [ "${arch}" != "${hostarch}" ]; then
         mkdir -p ${rootfs}/etc/dpkg/dpkg.cfg.d
         echo "foreign-architecture ${hostarch}" > ${rootfs}/etc/dpkg/dpkg.cfg.d/lxc-multiarch
+        
+        # Test if dpkg supports multiarch
+	if chroot $rootfs dpkg -l dpkg 2>&1 | grep -q "unknown option 'foreign-architecture'"; then
+	    echo "dpkg does not support multiarch: removing multiarch configuration file"
+            rm ${rootfs}/etc/dpkg/dpkg.cfg.d/lxc-multiarch
+        fi
     fi
 
     # Write a new sources.list containing both native and multiarch entries