From a631afcb7f6ac3c2c1041cf63d6fc89a42b0d811 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 17 Apr 2023 16:52:23 -0700 Subject: [PATCH] Unconditionally enable i386 in the chroot for Ubuntu Desktop; the new installer doesn't handle enabling this at install time, and late enablement also misses us some recommends. --- debian/changelog | 8 ++++++++ live-build/ubuntu/hooks/020-canary-live.chroot_early | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/debian/changelog b/debian/changelog index f7588a5e..ac02c8c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.832) UNRELEASED; urgency=medium + + * Unconditionally enable i386 in the chroot for Ubuntu Desktop; the new + installer doesn't handle enabling this at install time, and late + enablement also misses us some recommends. + + -- Steve Langasek Mon, 17 Apr 2023 16:51:13 -0700 + livecd-rootfs (2.831) lunar; urgency=medium * Use the correct path for the loop device. diff --git a/live-build/ubuntu/hooks/020-canary-live.chroot_early b/live-build/ubuntu/hooks/020-canary-live.chroot_early index 5bd741dd..4fb89b37 100755 --- a/live-build/ubuntu/hooks/020-canary-live.chroot_early +++ b/live-build/ubuntu/hooks/020-canary-live.chroot_early @@ -19,3 +19,10 @@ EOF cat < /etc/initramfs-tools/conf.d/default-layer.conf LAYERFS_PATH=${PASS}.squashfs EOF + +if [ "$(dpkg --print-architecture)" = amd64 ]; then + echo "I: Enabling amd64 multiarch support on amd64" + dpkg --add-architecture i386 + + apt-get -y update +fi