commit b00863011985587fb0acbda75472a66091bc3ec3
author Alessandro Astone <ales.astone@gmail.com> Fri Apr 02 00:18:16 2021 +0200
committer Jackeagle <jackeagle102@gmail.com> Sun Apr 11 00:54:51 2021 -0400
tree 9baa3bca3dc2054cad4d63f065699f542905295b
parent a86240962b646975303975163553c5f2fb8b3cd0

backuptool: Ensure dedicated partitions are not unused before mounting

* Ignore the block devices in case their mount points are symlinks.
  This is common on devices where maintainers have chosen not to use
  real partitions because of their size being too small to be useful

Also `continue` instead of `break`. Oops.

Change-Id: I3e27abe510219066ecacd81d099220ac8e119f9f

prebuilt/common/bin/backuptool.sh

diff --git a/prebuilt/common/bin/backuptool.sh b/prebuilt/common/bin/backuptool.sh
index 24647bf..a7d600b 100755
--- a/prebuilt/common/bin/backuptool.sh
+++ b/prebuilt/common/bin/backuptool.sh
@@ -142,7 +142,8 @@
 mount_extra() {
   for partition in $@; do
     mnt_point="/$partition"
-    mountpoint "$mnt_point" >/dev/null 2>&1 && break
+    mountpoint "$mnt_point" >/dev/null 2>&1 && continue
+    [ -L "$SYSMOUNT/$partition" ] && continue
 
     blk_dev=$(find_block "$partition")
     if [ -e "$blk_dev" ]; then

prebuilt/common/bin/backuptool_ab.sh

diff --git a/prebuilt/common/bin/backuptool_ab.sh b/prebuilt/common/bin/backuptool_ab.sh
index ca6b1f7..a5fde27 100755
--- a/prebuilt/common/bin/backuptool_ab.sh
+++ b/prebuilt/common/bin/backuptool_ab.sh
@@ -146,7 +146,8 @@
 mount_extra() {
   for partition in $@; do
     mnt_point="/postinstall/$partition"
-    mountpoint "$mnt_point" >/dev/null 2>&1 && break
+    mountpoint "$mnt_point" >/dev/null 2>&1 && continue
+    [ -L "$mnt_point" ] && continue
 
     blk_dev=$(find_block "$partition")
     if [ -n "$blk_dev" ]; then