Merge remote-tracking branch 'vorlon/lp.2036195' into ubuntu/master

This commit is contained in:
Steve Langasek 2023-09-18 15:06:20 -07:00
commit 9ff1479b4c
2 changed files with 9 additions and 1 deletions

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (23.10.39) UNRELEASED; 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 <steve.langasek@ubuntu.com> Sat, 16 Sep 2023 17:25:22 -0700
livecd-rootfs (23.10.38) mantic; urgency=medium
* desktop: construct a minimal+tpmfde catalog variation, with matching

View File

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