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:57 -0300
commitc746f6b50a81b5d0aa5bbbbf37df4349e9aefb04 (patch)
treebb22aa816603402314e7645728ecb6463bb97416 /tools/builder_common.sh
parentebeddac786bb536c6555d9b95d389c7dda5f5841 (diff)
downloadpfsense-c746f6b50a81b5d0aa5bbbbf37df4349e9aefb04.zip
pfsense-c746f6b50a81b5d0aa5bbbbf37df4349e9aefb04.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 a527d24..8ac386f 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -965,7 +965,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}
@@ -973,7 +973,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