openstack/diskimage-builder
Code Issues Proposed changes

Merge "Dont try to unmount if were not using tmpfs"

Browse Source
This commit is contained in:
Jenkins 2015-04-23 03:55:10 +00:00 committed by Gerrit Code Review
commit 5440d4b166
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/common-functions
View File

@ -172,7 +172,9 @@ function mount_qcow_image() {
function cleanup_dirs () { function cleanup_dirs () {
sudo rm -rf $TMP_BUILD_DIR/built sudo rm -rf $TMP_BUILD_DIR/built
sudo rm -rf $TMP_BUILD_DIR/mnt sudo rm -rf $TMP_BUILD_DIR/mnt
sudo umount -f $TMP_BUILD_DIR $TMP_IMAGE_DIR || true if tmpfs_check ; then
sudo umount -f $TMP_BUILD_DIR $TMP_IMAGE_DIR || true
fi
rm -rf --one-file-system $TMP_BUILD_DIR $TMP_IMAGE_DIR rm -rf --one-file-system $TMP_BUILD_DIR $TMP_IMAGE_DIR
} }