diff --git a/debian/changelog b/debian/changelog index e37561c6..3d90bead 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +livecd-rootfs (23.10.23) UNRELEASED; urgency=medium + + * i386 foreign-arch support was added for the canary image before 23.04 + released, but by mistake it was only added to the squashfs for the live + session, and not the squashfs layer used as the source for installation. + split the chroot hooks to add this to the standard.squashfs. + LP: #2033170. + + -- Steve Langasek Sat, 26 Aug 2023 15:05:13 -0700 + livecd-rootfs (23.10.22) mantic; urgency=medium * Undo preseeding in reset_snapd_state. diff --git a/live-build/ubuntu/hooks/020-canary-live.chroot_early b/live-build/ubuntu/hooks/020-canary-live.chroot_early index f5f165a5..96b316bb 100755 --- a/live-build/ubuntu/hooks/020-canary-live.chroot_early +++ b/live-build/ubuntu/hooks/020-canary-live.chroot_early @@ -26,10 +26,3 @@ 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 diff --git a/live-build/ubuntu/hooks/020-foreign-arch.chroot_early b/live-build/ubuntu/hooks/020-foreign-arch.chroot_early new file mode 100755 index 00000000..540cab3b --- /dev/null +++ b/live-build/ubuntu/hooks/020-foreign-arch.chroot_early @@ -0,0 +1,18 @@ +#! /bin/sh + +set -eu + +case ${PASS:-} in + standard) + ;; + *) + exit 0 + ;; +esac + +if [ "$(dpkg --print-architecture)" = amd64 ]; then + echo "I: Enabling amd64 multiarch support on amd64" + dpkg --add-architecture i386 + + apt-get -y update +fi