Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-23 11:21:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Steve Langasek 2023-08-26 15:06:14 -07:00
parent 809fbee16b
commit cb3f3292b2
3 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debian/changelog vendored
View File

@ -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 <steve.langasek@ubuntu.com> Sat, 26 Aug 2023 15:05:13 -0700
livecd-rootfs (23.10.22) mantic; urgency=medium
* Undo preseeding in reset_snapd_state.

7
live-build/ubuntu/hooks/020-canary-live.chroot_early
View File

@ -26,10 +26,3 @@ EOF
cat <<EOF > /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

18
live-build/ubuntu/hooks/020-foreign-arch.chroot_early Executable file
View File

@ -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