From 03561abb53afd226b9ef8b64e94fa73d8f045a58 Mon Sep 17 00:00:00 2001
From: Alexander Gordeev <agordeev@mirantis.com>
Date: Wed, 12 Nov 2014 21:27:34 +0300
Subject: [PATCH] Fix hanging mount points issues

Mainly fixes the building of target ubuntu image.
Just a couple of minor things like:
1) unreachable lazy umount due to `echo` return code
2) non removing of dissociated loop device
3) forgotten mirror unmounting

Change-Id: Ib991ebe31aa4b7a9f421a38d1dfee3d886177906
Closes-Bug: #1391896
---
 image/centos/module.mk                 |  3 +--
 image/ubuntu/create_separate_images.sh | 12 ++++++++----
 image/ubuntu/module.mk                 |  1 +
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/image/centos/module.mk b/image/centos/module.mk
index 2e3d1a4a9..622433bd7 100644
--- a/image/centos/module.mk
+++ b/image/centos/module.mk
@@ -8,8 +8,6 @@ clean_centos_image:
 	-sudo umount $(BUILD_DIR)/image/centos/SANDBOX/mirror
 	-sudo umount $(BUILD_DIR)/image/centos/SANDBOX/proc
 	-sudo umount $(BUILD_DIR)/image/centos/SANDBOX/dev
-	-sudo umount $(BUILD_DIR)/image/centos/image_boot
-	-sudo umount $(BUILD_DIR)/image/centos/image_root
 	sudo rm -rf $(BUILD_DIR)/image/centos
 
 $(ARTS_DIR)/$(TARGET_CENTOS_IMG_ART_NAME): $(BUILD_DIR)/images/$(TARGET_CENTOS_IMG_ART_NAME)
@@ -37,6 +35,7 @@ $(BUILD_DIR)/images/$(TARGET_CENTOS_IMG_ART_NAME):
 	sudo mkdir -p $(SANDBOX)/mirror
 	sudo mount -o bind $(LOCAL_MIRROR_CENTOS_OS_BASEURL) $(SANDBOX)/mirror
 	sudo chroot $(SANDBOX) python build_centos_image.py -k centos.ks -n centos_$(CENTOS_IMAGE_RELEASE)_$(CENTOS_ARCH) -s "$(SEPARATE_IMAGES)"
+	sudo umount $(SANDBOX)/mirror
 	sudo mv $(SANDBOX)/profile.yaml $(BUILD_DIR)/image/centos/
 	sudo mv $(SANDBOX)/centos_$(CENTOS_IMAGE_RELEASE)_$(CENTOS_ARCH)*.img $(BUILD_DIR)/image/centos/
 	gzip -f $(BUILD_DIR)/image/centos/centos_$(CENTOS_IMAGE_RELEASE)_$(CENTOS_ARCH)*.img
diff --git a/image/ubuntu/create_separate_images.sh b/image/ubuntu/create_separate_images.sh
index 5a2a63b07..3255a5065 100755
--- a/image/ubuntu/create_separate_images.sh
+++ b/image/ubuntu/create_separate_images.sh
@@ -56,7 +56,10 @@ if [ ! -d "$TMP_CHROOT_DIR" ]; then
     mkdir -p "$TMP_CHROOT_DIR" || die "Couldn't create directory"
 fi
 
-# try to remove stale files
+# try to remove stale files and mount points
+if mount | grep -q "${TMP_CHROOT_DIR}/tmp/mirror"; then
+    sudo umount ${TMP_CHROOT_DIR}/tmp/mirror
+fi
 for idx in $(seq $((${#MOUNTPOINTS[@]} - 1)) -1 0); do
     MOUNT_POINT=${MOUNTPOINTS[$idx]}
 
@@ -68,14 +71,15 @@ for idx in $(seq $((${#MOUNTPOINTS[@]} - 1)) -1 0); do
     SPARSE_FILE_NAME=${IMG_FILE_NAME}.${SPARSE_IMG_FILE_SUFFIX}
     LOOP_DEV=/dev/${FUEL_DEVICE_PREFIX}${idx}
     if mount | grep -q "${TMP_CHROOT_DIR}${MOUNT_POINT}"; then
-        sudo umount ${TMP_CHROOT_DIR}${MOUNT_POINT} || echo "Couldn't umnount old loop-device file, trying to perform lazy umnount"
+        sudo umount ${TMP_CHROOT_DIR}${MOUNT_POINT}
         if [ $? -ne 0 ]; then
+            echo "Couldn't umnount old loop-device file, trying to perform lazy umnount"
             sudo umount -l ${TMP_CHROOT_DIR}${MOUNT_POINT} || echo "Couldn't unmount old loop-device file"
         fi
     fi
     if [ -e "$LOOP_DEV" ]; then
-        # try to remove if it exists
-        sudo losetup -d $LOOP_DEV || die "Couldn't dissociate old loop-device file"
+        # try to remove if it exists, just dissociate first, ignore the errors.
+        sudo losetup -d $LOOP_DEV
         sudo rm -f $LOOP_DEV || die "Couldn't remove old loop-device file"
         sudo rm -f ${SPARSE_FILE_NAME} || die "Could remove old sparce image"
     fi
diff --git a/image/ubuntu/module.mk b/image/ubuntu/module.mk
index 304838368..cdbdb4a91 100644
--- a/image/ubuntu/module.mk
+++ b/image/ubuntu/module.mk
@@ -5,6 +5,7 @@ target_ubuntu_image: $(ARTS_DIR)/$(TARGET_UBUNTU_IMG_ART_NAME)
 clean: clean_ubuntu_image
 
 clean_ubuntu_image:
+	-sudo umount $(TMP_CHROOT)/tmp/mirror
 	-sudo umount $(TMP_CHROOT)/proc
 	-sudo umount $(TMP_CHROOT)/dev
 	-sudo umount $(TMP_CHROOT)/sys