From bc9a35d6543ee1832412920f6c8ddb676fc9bd14 Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Tue, 19 Sep 2023 01:51:08 +0000 Subject: [PATCH] Imported 23.10.39 from mantic-release pocket. No reason for CPC update specified. --- debian/changelog | 15 +++++++++++++++ live-build/auto/config | 12 ++++++++++++ live-build/functions | 2 +- .../ubuntu/hooks/020-ubuntu-enhanced-sb.binary | 2 ++ 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0732ef1d..2607d1e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +livecd-rootfs (23.10.39) mantic; urgency=medium + + * The chroot tmpfs mount should only be /var/lib/apt/lists, not + /var/lib/apt; the latter breaks changes to /var/lib/apt/extended_states. + LP: #2036195. + + -- Steve Langasek Mon, 18 Sep 2023 15:06:23 -0700 + +livecd-rootfs (23.10.38) mantic; urgency=medium + + * desktop: construct a minimal+tpmfde catalog variation, with matching + layers (LP: #2036461) + + -- Dan Bungert Mon, 18 Sep 2023 15:48:33 -0600 + livecd-rootfs (23.10.37) mantic; urgency=medium * fix: ensure minimize-manual script uses passed in argument for all commands (LP: #2036198) diff --git a/live-build/auto/config b/live-build/auto/config index dc2a3c35..20d28139 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -727,12 +727,14 @@ case $PROJECT in add_snap minimal.standard.live ubuntu-desktop-installer/classic add_package minimal.standard.live linux-generic-hwe-22.04 casper # the enhanced-secureboot layer, contains all packages for the enhanced secureboot install + add_package minimal.enhanced-secureboot cryptsetup boot-managed-by-snapd add_package minimal.standard.enhanced-secureboot cryptsetup boot-managed-by-snapd # language support seeded_langs="$(get_seeded_languages desktop)" echo "$seeded_langs" | tr ' ' ',' > config/seeded-languages derive_language_layers minimal desktop-minimal desktop-minimal-default-languages "$seeded_langs" + derive_language_layers minimal.enhanced-secureboot desktop-minimal desktop-default-languages "$seeded_langs" derive_language_layers minimal.standard desktop desktop-default-languages "$seeded_langs" derive_language_layers minimal.standard.enhanced-secureboot desktop desktop-default-languages "$seeded_langs" @@ -746,6 +748,16 @@ case $PROJECT in default: yes variant: desktop locale_support: langpack + variations: + minimal: + path: minimal.squashfs + EOF + cat <<-EOF > config/minimal.enhanced-secureboot.catalog-in.yaml + id: ubuntu-desktop-minimal + variations: + minimal-enhanced-secureboot: + path: minimal.enhanced-secureboot.squashfs + snapd_system_label: enhanced-secureboot-desktop EOF cat <<-EOF > config/minimal.standard.catalog-in.yaml name: "Ubuntu Desktop" diff --git a/live-build/functions b/live-build/functions index 84e062c9..b9ac85ec 100644 --- a/live-build/functions +++ b/live-build/functions @@ -138,7 +138,7 @@ setup_mountpoint() { # cgroup2 mount for LP: 1944004 mount -t cgroup2 none "$mountpoint/sys/fs/cgroup" mount -t tmpfs none "$mountpoint/tmp" - mount -t tmpfs none "$mountpoint/var/lib/apt" + mount -t tmpfs none "$mountpoint/var/lib/apt/lists" mount -t tmpfs none "$mountpoint/var/cache/apt" mv "$mountpoint/etc/resolv.conf" resolv.conf.tmp cp /etc/resolv.conf "$mountpoint/etc/resolv.conf" diff --git a/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary b/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary index 3f645ba4..1fcd2b42 100644 --- a/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary +++ b/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary @@ -5,6 +5,8 @@ set -eux case ${PASS:-} in minimal.standard.enhanced-secureboot) ;; + minimal.enhanced-secureboot) + ;; *) exit 0 ;;