From d2cf2d4ea113b38e5a281f09af5faa54210ae7a5 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 2350d69b..36191260 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.525.62) bionic; 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:20:20 +0100 + livecd-rootfs (2.525.61) bionic; urgency=medium [ Samir Akarioh ] diff --git a/live-build/functions b/live-build/functions index 435f8721..928330fb 100644 --- a/live-build/functions +++ b/live-build/functions @@ -95,7 +95,7 @@ setup_mountpoint() { mount proc-live -t proc "$mountpoint/proc" mount sysfs-live -t sysfs "$mountpoint/sys" 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"