Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-03-31 04:41:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'umount' of https://git.launchpad.net/~xypron/livecd-rootfs into ubuntu/master

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2021-12-16 12:40:11 +01:00
commit 6df425bb34
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}"