[gentoo-commits] proj/gentoaster:master commit in: /

["Liam McLoughlin" <hexxeh@hexxeh.net>]

commit:     0318eec2f613ed905363c31316fd50ee8bdde85d
Author:     Liam McLoughlin <hexxeh <AT> hexxeh <DOT> net>
AuthorDate: Fri Jul 15 20:40:31 2011 +0000
Commit:     Liam McLoughlin <hexxeh <AT> hexxeh <DOT> net>
CommitDate: Fri Jul 15 20:40:31 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoaster.git;a=commit;h=0318eec2

Let's try not to nuke /dev if things go wrong

---
 create_image.sh |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/create_image.sh b/create_image.sh
index f87e507..77664f1 100755
--- a/create_image.sh
+++ b/create_image.sh
@@ -64,8 +64,8 @@ cleanup_mounts() {
 	umount -d -f ${IMAGE_WORK_PATH}/rootfs/dev/shm &>> ${LOG_FILE}
 	umount -d -f ${IMAGE_WORK_PATH}/rootfs/dev &>> ${LOG_FILE}
 	umount -d -f ${IMAGE_WORK_PATH}/rootfs/proc &>> ${LOG_FILE}
-	umount -d -f ${IMAGE_WORK_PATH}/rootfs/boot &>> ${LOG_FILE}
-	umount -d -f ${IMAGE_WORK_PATH}/rootfs &>> ${LOG_FILE}
+	umount -d -f -l  ${IMAGE_WORK_PATH}/rootfs/boot &>> ${LOG_FILE}
+	umount -d -f -l ${IMAGE_WORK_PATH}/rootfs &>> ${LOG_FILE}
 	sleep 2
 }
 
@@ -73,8 +73,7 @@ cleanup_mounts() {
 handle_error() {
 	echo "$1" 
 	cd ${IMAGE_WORK_PATH}
-	cleanup_mounts
-	rm -rf ${IMAGE_WORK_PATH}
+	cleanup_mounts && rm -rf ${IMAGE_WORK_PATH}
 	exit 1
 }