From 908042dbc9fa34e94b835e2d6de49b8cf15ab193 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Sat, 16 Sep 2023 17:27:45 -0700 Subject: [PATCH] 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. (cherry picked from commit 1deccc2edd7f139b84a6cb3d0a4dfe5ebaff50c7) # Conflicts: # debian/changelog --- debian/changelog | 9 +++++++++ live-build/functions | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e1b0a80b..68865f8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.664.51) focal; urgency=medium + + [Steve Langasek] + * 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. + + -- Phil Roche Thu, 19 Oct 2023 18:17:20 +0100 + livecd-rootfs (2.664.50) focal; urgency=medium * Do not modify /etc/ssh/sshd_config for ubuntu-cpc diff --git a/live-build/functions b/live-build/functions index 931f0225..fa9bcda6 100644 --- a/live-build/functions +++ b/live-build/functions @@ -109,7 +109,7 @@ setup_mountpoint() { mount -o bind /usr/share/livecd-rootfs/live-build/apparmor/generic "$mountpoint/sys/kernel/security/apparmor/features/" mount -o bind /usr/share/livecd-rootfs/live-build/seccomp/generic.actions_avail "$mountpoint/proc/sys/kernel/seccomp/actions_avail" 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"