summaryrefslogtreecommitdiffstats
path: root/tools/builder_common.sh
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-09-27 08:21:43 -0300
committerRenato Botelho <renato@netgate.com>2016-09-27 08:21:43 -0300
commit3291893538f1d2eed007d008fa8f6b62d0209768 (patch)
treedd995bf51bce3488ee0c889d04b83d8ec32b80fe /tools/builder_common.sh
parent406a904be39c676431096ed8c48b3dedb4da0cde (diff)
downloadpfsense-3291893538f1d2eed007d008fa8f6b62d0209768.zip
pfsense-3291893538f1d2eed007d008fa8f6b62d0209768.tar.gz
If umount fails, use umount -f
Diffstat (limited to 'tools/builder_common.sh')
-rw-r--r--tools/builder_common.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index ced9483..79ab4a1 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
OpenPOWER on IntegriCloud