Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-14 12:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge bugfix/ubuntu-cpc-LP-2036195-auto-installed-packages-focal into ubuntu/focal [a=philroche] [r=andrew-cloke,vorlon]

Browse Source 
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.

MP: https://code.launchpad.net/~philroche/livecd-rootfs/+git/livecd-rootfs/+merge/454066
This commit is contained in:
Philip Roche 2023-10-26 16:57:56 +01:00
commit 05e4d0bec0
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
debian/changelog vendored
View File

@ -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 <phil.roche@canonical.com> Thu, 19 Oct 2023 18:17:20 +0100
livecd-rootfs (2.664.50) focal; urgency=medium livecd-rootfs (2.664.50) focal; urgency=medium
* Do not modify /etc/ssh/sshd_config for ubuntu-cpc * Do not modify /etc/ssh/sshd_config for ubuntu-cpc

2
live-build/functions
View File

@ -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/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 -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/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" mount -t tmpfs none "$mountpoint/var/cache/apt"
mv "$mountpoint/etc/resolv.conf" resolv.conf.tmp mv "$mountpoint/etc/resolv.conf" resolv.conf.tmp
cp /etc/resolv.conf "$mountpoint/etc/resolv.conf" cp /etc/resolv.conf "$mountpoint/etc/resolv.conf"