From 047620e42940dae670effaf971f58202a1fb4986 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Tue, 14 Feb 2017 08:41:50 -0200
Subject: Make sure $MNT is umounted

---
 tools/builder_common.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'tools')

diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index 5d50002..1e2293e 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -793,7 +793,8 @@ awk '
 			echo "/dev/ufs/cf /cf ufs ro,sync,noatime 1 1" >> ${MNT}/etc/fstab
 		fi
 
-		umount ${MNT}
+		sync; sync; sync
+		umount ${MNT} || umount -f ${MNT}
 		# Restore the original trap
 		trap "mdconfig -d -u ${MD}; return" 1 2 15 EXIT
 
@@ -824,7 +825,8 @@ awk '
 				echo "/dev/ufs/cf /cf ufs ro,sync,noatime 1 1" >> ${MNT}/etc/fstab
 			fi
 
-			umount ${MNT}
+			sync; sync; sync
+			umount ${MNT} || umount -f ${MNT}
 			# Restore the trap back
 			trap "mdconfig -d -u ${MD}; return" 1 2 15 EXIT
 		fi
@@ -849,7 +851,8 @@ awk '
 
 			clone_directory_contents ${FINAL_CHROOT_DIR}/cf ${MNT}
 
-			umount ${MNT}
+			sync; sync; sync
+			umount ${MNT} || umount -f ${MNT}
 			# Restore the trap back
 			trap "mdconfig -d -u ${MD}; return" 1 2 15 EXIT
 		else
-- 
cgit v1.1