sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Only unmount directories that are mounted"

Browse Source
This commit is contained in:
Jenkins 2017-05-17 17:32:11 +00:00 committed by Gerrit Code Review
commit 340738fb86
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
diskimage_builder/lib/common-functions
View File

@ -343,6 +343,8 @@ function unmount_dir {
local dir="$1" local dir="$1"
local real_dir local real_dir
local mnts local mnts
local split_mounts
local found_mountpoint
if [ ! -d $dir ]; then if [ ! -d $dir ]; then
echo "*** $dir is not a directory" echo "*** $dir is not a directory"
@ -353,12 +355,30 @@ function unmount_dir {
# /proc/mounts is the real path # /proc/mounts is the real path
real_dir=$(readlink -e $dir) real_dir=$(readlink -e $dir)
# populate the exported mountpoints
IFS='|' read -ra split_mounts <<< "$DIB_MOUNTPOINTS"
# note the "/" on real_dir ... we are just looking for things # note the "/" on real_dir ... we are just looking for things
# mounted *underneath* this directory. # mounted *underneath* this directory.
mnts=$(awk '{print $2}' < /proc/mounts | grep "^$real_dir/" | sort -r) mnts=$(awk '{print $2}' < /proc/mounts | grep "^$real_dir/" | sort -r)
for m in $mnts; do for m in $mnts; do
echo "Unmount $m" # check if suffix is in array
sudo umount -fl $m || true found_mountpoint=false
for mountpoint in "${split_mounts[@]}"; do
if [[ "$mountpoint" != "/" ]]; then
if [[ "$m" == *$mountpoint ]]; then
echo "Mountpoint $m managed by block device; skipping"
found_mountpoint=true
break
fi
fi
done
if [ $found_mountpoint == false ]; then
# unmount the directory as it is not managed by block device
echo "Unmount $m"
sudo umount -fl $m || true
fi
done done
} }