From 28dbf57aefc251e2a75ce99e85cdef82dbbd385a Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Wed, 19 Dec 2012 10:42:32 +0100
Subject: use right mountpoint for umount call and always use umount -l

---
 bin/g-i-installation.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'bin')

diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 0660faf4..5cc50788 100755
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -96,7 +96,7 @@ cleanup_all() {
 	#
 	# cleanup
 	#
-	sudo umount $IMAGE_MNT
+	sudo umount -l $IMAGE_MNT
 }
 
 show_preseed() {
@@ -362,7 +362,9 @@ case $JOB_NAME in
 			# kill qemu and image
 			#
 			sudo kill -9 $(ps fax | grep [q]emu-system | grep ${NAME}_preseed.cfg 2>/dev/null | awk '{print $1}') || true
-			if [ ! -z $IMAGE ] ; then sudo umount -l $IMAGE ; fi
+			if [ ! -z $IMAGE ] ; then
+				sudo umount -l $IMAGE_MNT || true
+			fi
 			boot_system
 			monitor_system normal
 			;;
-- 
cgit v1.2.3-70-g09d2