Commit 9114b5fd by David Noyes Committed by Stéphane Graber

Alternative test for dpkg multiarch support in lxc-debian template

parent 49e7702b
...@@ -383,13 +383,9 @@ EOF ...@@ -383,13 +383,9 @@ EOF
# If the container isn't running a native architecture, setup multiarch # If the container isn't running a native architecture, setup multiarch
if [ "${arch}" != "${hostarch}" ]; then 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 # Test if dpkg supports multiarch
if chroot $rootfs dpkg -l dpkg 2>&1 | grep -q "unknown option 'foreign-architecture'"; then if ! chroot $rootfs dpkg --print-foreign-architecture 2>&1; then
echo "dpkg does not support multiarch: removing multiarch configuration file" chroot $rootfs dpkg --add-architecture ${hostarch}
rm ${rootfs}/etc/dpkg/dpkg.cfg.d/lxc-multiarch
fi fi
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment