archbuild.in: delete old chroot more forcefully

1 files changed, 10 insertions, 0 deletions

diff --git a/archbuild.in b/archbuild.in
index 4194b68..73ae65d 100644
--- a/archbuild.in
+++ b/archbuild.in
@@ -69,6 +69,16 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
 
 		subvolume_delete_recursive "${copy}"
 		rm -rf --one-file-system "${copy}"
+		if [ -d "${copy}" ]; then
+			find "${copy}" \
+				-xdev -mindepth 1 -type d \
+				-exec 'mountpoint' '-q' '{}' ';' \
+				-exec 'umount' '-l' '{}' ';'
+			rm -rf --one-file-system "${copy}"
+			mountpoint -q "${copy}" && \
+				umount -l "${copy}" && \
+				rmdir "${copy}"
+		fi
 	done
 	lock_close 9