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

Commit f7584a22 authored by Yo Chiang's avatar Yo Chiang Committed by Gerrit Code Review
Browse files

Merge changes I5058cbe8,Ia0b3f1c9 

* changes:
  adb-remount-test: Strengthen skip_administrative_mounts
  fs_mgr_overlayfs_mount_fstab_entry(): Rename source device name
parents a14beb2d f931ad94

fs_mgr/fs_mgr_overlayfs.cpp

+9 −7
Original line number Diff line number Diff line
@@ -1310,13 +1310,15 @@ bool fs_mgr_overlayfs_mount_fstab_entry(const android::fs_mgr::FstabEntry& entry 
        options += ",override_creds=off";

    }



    // Use .blk_device as the mount() source for debugging purposes.

    // Overlayfs is pseudo filesystem, so the source device is a symbolic value and isn't used to

    // back the filesystem. /proc/mounts would show the source as the device name of the mount.

    auto report = "__mount(source=" + entry.blk_device + ",target=" + entry.mount_point +

                  ",type=overlay," + options + ")=";

    auto ret = mount(entry.blk_device.c_str(), entry.mount_point.c_str(), "overlay",

                     MS_RDONLY | MS_NOATIME, options.c_str());

    // Use "overlay-" + entry.blk_device as the mount() source, so that adb-remout-test don't

    // confuse this with adb remount overlay, whose device name is "overlay".

    // Overlayfs is a pseudo filesystem, so the source device is a symbolic value and isn't used to

    // back the filesystem. However the device name would be shown in /proc/mounts.

    auto source = "overlay-" + entry.blk_device;

    auto report = "__mount(source=" + source + ",target=" + entry.mount_point + ",type=overlay," +

                  options + ")=";

    auto ret = mount(source.c_str(), entry.mount_point.c_str(), "overlay", MS_RDONLY | MS_NOATIME,

                     options.c_str());

    if (ret) {

        PERROR << report << ret;

        return false;

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}"