Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-23 03:11:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert change for local builds as it is breaking autopkgtests

Browse Source
This commit is contained in:
William Wilson 2022-01-12 18:19:57 -06:00
parent 40cbbbb9c9
commit 2312c08d26
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.751) jammy; urgency=medium
* Revert patch for unmounting in local builds as it is causing autopkgtest
regressions
-- William 'jawn-smith' Wilson <jawn-smith@ubuntu.com> Wed, 12 Jan 2022 13:43:24 -0600
livecd-rootfs (2.750) jammy; urgency=medium
* Do not look for a base snap on snaps of type base, because recursive

9
live-build/functions
View File

@ -158,17 +158,10 @@ teardown_mountpoint() {
# ensure we have exactly one trailing slash, and escape all slashes for awk
mountpoint_match=$(echo "$mountpoint" | sed -e's,/$,,; s,/,\\/,g;')'\/'
# Make all submounts private
for submount in $(awk </proc/self/mounts "\$2 ~ /$mountpoint_match/ \
{ print \$2 }" | LC_ALL=C sort -r); do
mount --make-private $submount
done
# Now we can unmount them
# sort -r ensures that deeper mountpoints are unmounted first
for submount in $(awk </proc/self/mounts "\$2 ~ /$mountpoint_match/ \
{ print \$2 }" | LC_ALL=C sort -r); do
mount --make-private $submount
umount $submount
done
recover_sourceslist "${mountpoint}"