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 fe1b7db23dcd2087bab272bf55cd6edec2a137c9..92b99dd4214b90bcace3c6063cabd4b06a0794f4 100644 (file)
--- a/templates/lxc-debian.in
+++ b/templates/lxc-debian.in
@@ -385,6 +385,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