Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-11 19:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

functions: fix unmounting for local builds

Browse Source 
livecd-rootfs creates non-private mounts. When building locally using
the auto/build script unmounting fails.

To unmount dev/pts it is insufficient to make the mount private. Its
parents must be private too. Change teardown_mountpoint() accordingly.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
This commit is contained in:
Heinrich Schuchardt 2021-12-01 13:52:42 +01:00
parent 1a7e9ca8c9
commit d65af891f3
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
live-build/functions
View File

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