mountpoint: always try to unmount

Previously, the previous mountpoints were all visible from the new one, which caused exponential growth of the mountpoint table (size = count ^ 2 - 1) Signed-off-by: Victor "multun" Collod <[email protected]>
epita · Jan 30, 2019 · 7ac7e11 · 7ac7e11
1 parent 2824ecd
commit 7ac7e11
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/arch-creator.sh b/arch-creator.sh
@@ -214,13 +214,14 @@ squashfs() {
 # directory must be already mounted before chrooting in
 mount_bind() {
 	step "Mounting ROOTFS"
-	mount --bind ${ROOTFS_DIR} ${ROOTFS_DIR}
+	mount --bind "${ROOTFS_DIR}" "${ROOTFS_DIR}"
+	trap umount_bind EXIT
 	unstep
 }
 
 umount_bind() {
 	step "Unmounting ROOTFS"
-	umount ${ROOTFS_DIR}
+	umount "${ROOTFS_DIR}"
 	unstep
 }
 
@@ -259,7 +260,6 @@ clean() {
 
 	step "Cleaning ${IMAGE_NAME}"
 
-	umount_bind
 	run rm -rf `dirname "${ROOTFS_DIR}"`
 	run rm -rf "${IMAGES_DIR}/${IMAGE_NAME}.squashfs"
 	run rm -rf "${IMAGES_DIR}/${IMAGE_NAME}_*"