commit 99ffae906891d9ebb9de8d049b241af0a74fa961
author Alessandro Astone <ales.astone@gmail.com> Fri Apr 02 00:18:16 2021 +0200
committer micky387 <mickaelsaibi@free.fr> Tue Jul 25 10:36:14 2023 +0200
tree d3423e102c75c1cfb0fdbca7b7ba7e7362edfb81
parent c0272170c842e3f0f7d6b2015bee91dc4172bb81

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 35199b9..8866e97 100755
--- a/prebuilt/common/bin/backuptool.sh
+++ b/prebuilt/common/bin/backuptool.sh
@@ -138,7 +138,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 b1513e5..433ec78 100755
--- a/prebuilt/common/bin/backuptool_ab.sh
+++ b/prebuilt/common/bin/backuptool_ab.sh
@@ -149,7 +149,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