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

Merge "Refactor unmount_image with unmount_dir"

Browse Source
This commit is contained in:
Jenkins 2014-01-03 10:17:12 +00:00 committed by Gerrit Code Review
commit 09a8fca8d0
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/img-functions
View File

@ -22,11 +22,7 @@ function unmount_image () {
# unmount from the chroot # unmount from the chroot
# Don't use TMP_MOUNT_PATH here, it might not have been set. # Don't use TMP_MOUNT_PATH here, it might not have been set.
local MOUNTS unmount_dir "$TMP_BUILD_DIR/mnt"
MOUNTS=$(grep < /proc/mounts " $TMP_BUILD_DIR/mnt" | awk '{ print $2 }' | sort -r)
for M in $MOUNTS; do
sudo umount -fl $M || true
done
if [ -n "$EXTRA_UNMOUNT" ]; then if [ -n "$EXTRA_UNMOUNT" ]; then
$EXTRA_UNMOUNT $EXTRA_UNMOUNT
fi fi