]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
Test dpkg for multiarch support in lxc-debian template
authorDavid Noyes <david.noyes@plus.net>
Wed, 26 Aug 2015 13:18:49 +0000 (14:18 +0100)
committerDavid Noyes <david.j.noyes@gmail.com>
Wed, 26 Aug 2015 15:23:31 +0000 (15:23 +0000)
Signed-off-by: David Noyes <david.j.noyes@gmail.com>
templates/lxc-debian.in

index 39146054cd238cd1bfaa2974de007d3e7cbb9617..50e623208835f2e106fd32778e12ae053afef233 100644 (file)
@@ -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