From 3291893538f1d2eed007d008fa8f6b62d0209768 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Tue, 27 Sep 2016 08:21:43 -0300 Subject: [PATCH] If umount fails, use umount -f --- tools/builder_common.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/builder_common.sh b/tools/builder_common.sh index ced9483e8e..79ab4a1366 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -673,7 +673,7 @@ create_ova_image() { echo ">>> ERROR: Error mounting temporary vmdk image. STOPPING!" | tee -a ${LOGFILE} print_error_pfS fi - trap "sync; sleep 3; umount ${_mntdir}; mdconfig -d -u ${_md}; return" 1 2 15 EXIT + trap "sync; sleep 3; umount ${_mntdir} || umount -f ${_mntdir}; mdconfig -d -u ${_md}; return" 1 2 15 EXIT echo "Done!" | tee -a ${LOGFILE} @@ -681,7 +681,7 @@ create_ova_image() { sync sleep 3 - umount ${_mntdir} 2>&1 >>${LOGFILE} + umount ${_mntdir} || umount -f ${_mntdir} >>${LOGFILE} 2>&1 mdconfig -d -u ${_md} trap "-" 1 2 15 EXIT