From 40a3b73b5e85aaec1f37e4452c33fb4ca010e177 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 c07c9aaf..8638cac9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.765.29) jammy; 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:10:20 +0100 + livecd-rootfs (2.765.28) jammy; urgency=medium * Fix unminimize to correctly list packages. (LP: #1996489) diff --git a/live-build/functions b/live-build/functions index 18229e32..215fed89 100644 --- a/live-build/functions +++ b/live-build/functions @@ -141,7 +141,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"