From 28e58a6a4fc22a15e01b34874b5f8e9486e25e42 Mon Sep 17 00:00:00 2001 From: David Noyes Date: Wed, 26 Aug 2015 14:18:49 +0100 Subject: [PATCH] Test dpkg for multiarch support in lxc-debian template Signed-off-by: David Noyes --- templates/lxc-debian.in | 6 ++++++ 1 file changed, 6 insertions(+) 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