From e3b1ebd214b89b11574254f6af18734cc05fae77 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Wed, 15 Feb 2017 08:55:38 -0200
Subject: Make sure OVA_TMP is umounted before start using it

---
 tools/builder_common.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index 091266a..b4e1511 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -920,6 +920,17 @@ create_ova_image() {
 	LOGFILE=${BUILDER_LOGS}/ova.${TARGET}.log
 
 	if [ -d "${OVA_TMP}" ]; then
+		local _dev
+		# XXX Root cause still didn't found but it doesn't umount
+		#     properly on looped builds and then require this extra
+		#     check
+		while true; do
+			_dev=$(mount -p ${OVA_TMP} 2>/dev/null | awk '{print $1}')
+			[ $? -ne 0 -o -z "${_dev}" ] \
+				&& break
+			umount -f ${OVA_TMP}
+			mdconfig -d -u ${_dev#/dev/}
+		done
 		chflags -R noschg ${OVA_TMP}
 		rm -rf ${OVA_TMP}
 	fi
-- 
cgit v1.1