Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85703980 authored by Yi-Yo Chiang's avatar Yi-Yo Chiang
Browse files

adb-remount-test: Strengthen skip_administrative_mounts 

Refactor skip_administrative_mounts so that it filters by device name,
mount point and filesystem type. (Was filtering by device name and mount
point.)

We need this because pseudo filesystems such as tmpfs and overlayfs can
have free-formed device name:

  blah /mnt/mnt_point overlay ro,lowerdir=...

However the filesystem type (third field of /proc/mounts) must be
reflecting the actual filesystem, so to robustly filter out
administrative filesystems, we have to check the filesystem type field.

Bug: 188862155
Test: adb-remount-test.sh
Change-Id: I5058cbe8a36920f25b73a5d5833e9fc5a096e90f
Merged-In: I5058cbe8a36920f25b73a5d5833e9fc5a096e90f
(cherry picked from commit f931ad94)
parent a38c89a2

fs_mgr/tests/adb-remount-test.sh

+38 −13
Original line number Diff line number Diff line
@@ -735,23 +735,46 @@ check_ne() { 
  fi

}



[ "USAGE: join_with <delimiter> <strings>



Joins strings with delimiter" ]

join_with() {

  if [ "${#}" -lt 2 ]; then

    echo

    return

  fi

  local delimiter="${1}"

  local result="${2}"

  shift 2

  for element in "${@}"; do

    result+="${delimiter}${element}"

  done

  echo "${result}"

}



[ "USAGE: skip_administrative_mounts [data] < /proc/mounts



Filters out all administrative (eg: sysfs) mounts uninteresting to the test" ]

skip_administrative_mounts() {

  local exclude_filesystems=(

    "overlay" "tmpfs" "none" "sysfs" "proc" "selinuxfs" "debugfs" "bpf"

    "binfmt_misc" "cg2_bpf" "pstore" "tracefs" "adb" "mtp" "ptp" "devpts"

    "ramdumpfs" "binder" "securityfs" "functionfs" "rootfs"

  )

  local exclude_devices=(

    "[/]sys[/]kernel[/]debug" "[/]data[/]media" "[/]dev[/]block[/]loop[0-9]*"

    "${exclude_filesystems[@]}"

  )

  local exclude_mount_points=(

    "[/]cache" "[/]mnt[/]scratch" "[/]mnt[/]vendor[/]persist" "[/]persist"

    "[/]metadata"

  )

  if [ "data" = "${1}" ]; then

    grep -v " /data "

  else

    cat -

  fi |

  grep -v \

    -e "^\(overlay\|tmpfs\|none\|sysfs\|proc\|selinuxfs\|debugfs\|bpf\) " \

    -e "^\(binfmt_misc\|cg2_bpf\|pstore\|tracefs\|adb\|mtp\|ptp\|devpts\) " \

    -e "^\(ramdumpfs\|binder\|/sys/kernel/debug\|securityfs\) " \

    -e " functionfs " \

    -e "^\(/data/media\|/dev/block/loop[0-9]*\) " \

    -e "^rootfs / rootfs rw," \

    -e " /\(cache\|mnt/scratch\|mnt/vendor/persist\|persist\|metadata\) "

    exclude_mount_points+=("[/]data")

  fi

  awk '$1 !~ /^('"$(join_with "|" "${exclude_devices[@]}")"')$/ &&

      $2 !~ /^('"$(join_with "|" "${exclude_mount_points[@]}")"')$/ &&

      $3 !~ /^('"$(join_with "|" "${exclude_filesystems[@]}")"')$/'

}



[ "USAGE: skip_unrelated_mounts < /proc/mounts
@@ -907,9 +930,11 @@ ACTIVE_SLOT=`get_active_slot` 


# Acquire list of system partitions



# KISS (assume system partition mount point is "/<partition name>")

PARTITIONS=`adb_su cat /vendor/etc/fstab* </dev/null |

              grep -v "^[#${SPACE}${TAB}]" |

              skip_administrative_mounts |

              sed -n "s@^\([^ ${TAB}/][^ ${TAB}/]*\)[ ${TAB}].*[, ${TAB}]ro[, ${TAB}].*@\1@p" |

              awk '$1 ~ /^[^/]+$/ && "/"$1 == $2 && $4 ~ /(^|,)ro(,|$)/ { print $1 }' |

              sort -u |

              tr '\n' ' '`

PARTITIONS="${PARTITIONS:-system vendor}"