root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

util-iso-overlayfs/aufs: only umount image if tracking array is not empty

Browse source
This commit is contained in:
udeved 2016-06-12 14:11:12 +02:00
parent 866da5cdb2
commit 98b11ef576
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/util-iso-aufs.sh
View file

@ -27,7 +27,9 @@ mount_image_custom(){
# $1: image path
umount_image(){
umount "${IMAGE_ACTIVE_MOUNTS[@]}"
unset IMAGE_ACTIVE_MOUNTS
find $1 -name '.wh.*' -delete &> /dev/null
if [[ -n ${IMAGE_ACTIVE_MOUNTS[@]} ]];then
umount "${IMAGE_ACTIVE_MOUNTS[@]}"
unset IMAGE_ACTIVE_MOUNTS
find $1 -name '.wh.*' -delete &> /dev/null
fi
}

10
lib/util-iso-overlayfs.sh
View file

@ -28,8 +28,10 @@ mount_image_custom(){
}
umount_image(){
info "%s umount: [%s]" "${iso_fs}" "${IMAGE_ACTIVE_MOUNTS[@]}"
umount "${IMAGE_ACTIVE_MOUNTS[@]}"
unset IMAGE_ACTIVE_MOUNTS
rm -rf "${work_dir}/work"
if [[ -n ${IMAGE_ACTIVE_MOUNTS[@]} ]];then
info "%s umount: [%s]" "${iso_fs}" "${IMAGE_ACTIVE_MOUNTS[@]}"
umount "${IMAGE_ACTIVE_MOUNTS[@]}"
unset IMAGE_ACTIVE_MOUNTS
rm -rf "${work_dir}/work"
fi
}