From 0318eec2f613ed905363c31316fd50ee8bdde85d Mon Sep 17 00:00:00 2001 From: Liam McLoughlin Date: Fri, 15 Jul 2011 21:40:31 +0100 Subject: Let's try not to nuke /dev if things go wrong --- create_image.sh | 7 +++---- 1 file 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 } -- cgit v1.2.3-65-gdbad