From: Daniel Golle <daniel@makrotopia.org>
Date: Wed, 4 Aug 2021 18:03:16 +0000 (+0100)
Subject: base-files: upgrade: try umount lvm and loop devices
X-Git-Tag: v22.03.0-rc1~2050
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e67865c569c0cbdc452c63b54b02f5c3cc4d247a;p=openwrt%2Fstaging%2Fhauke.git

base-files: upgrade: try umount lvm and loop devices

Try umount on device mapper and loop devices still mounted, so the
subsequent call to disactivate all physical volumes and delete all
loop devices is more likely to succeed.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2
index 30ad19f7f1..45fb98d889 100755
--- a/package/base-files/files/lib/upgrade/stage2
+++ b/package/base-files/files/lib/upgrade/stage2
@@ -64,6 +64,10 @@ switch_to_ramfs() {
 	/bin/mount -o remount,ro /mnt
 	/bin/umount -l /mnt
 
+	grep -e "^/dev/dm-.*" -e "^/dev/loop.*" /proc/mounts | while read bdev mp _r; do
+		umount $mp
+	done
+
 	[ "$RAMFS_COPY_LOSETUP" ] && losetup -D
 	[ "$RAMFS_COPY_LVM" ] && {
 		mkdir -p /tmp/lvm/cache