fs_mgr: adb-remount-test.sh: filter out more administrivia mounts.
binder /dev/binderfs binder rw,relatime,max=1048576,stats=global 0 0 /sys/kernel/debug /sys/kernel/debug debugfs rw,seclabel,relatime 0 0 /dev/block/dm-3 240548676 3692368 236856308 2% /data_mirror/cur_profiles are administrative mounts uninteresting to the adb remount test. Fix system and vendor devt tests, turn them into warnings instead. Signed-off-by: Mark Salyzyn <salyzyn@google.com> Bug: 170256128 Bug: 169988379 Test: adb-remount-test.sh Change-Id: Ie19722a9ad813dce014bc27610e6db035e6c69e9
This commit is contained in:
parent
3f452134da
commit
08cd8b70c2
|
@ -740,7 +740,7 @@ skip_administrative_mounts() {
|
|||
grep -v \
|
||||
-e "^\(overlay\|tmpfs\|none\|sysfs\|proc\|selinuxfs\|debugfs\|bpf\) " \
|
||||
-e "^\(binfmt_misc\|cg2_bpf\|pstore\|tracefs\|adb\|mtp\|ptp\|devpts\) " \
|
||||
-e "^\(ramdumpfs\) " \
|
||||
-e "^\(ramdumpfs\|binder\|/sys/kernel/debug\) " \
|
||||
-e " functionfs " \
|
||||
-e "^\(/data/media\|/dev/block/loop[0-9]*\) " \
|
||||
-e "^rootfs / rootfs rw," \
|
||||
|
@ -755,7 +755,7 @@ Filters out all apex and vendor override administrative overlay mounts
|
|||
uninteresting to the test" ]
|
||||
skip_unrelated_mounts() {
|
||||
grep -v "^overlay.* /\(apex\|bionic\|system\|vendor\)/[^ ]" |
|
||||
grep -v "[%] /\(apex\|bionic\|system\|vendor\)/[^ ][^ ]*$"
|
||||
grep -v "[%] /\(data_mirror\|apex\|bionic\|system\|vendor\)/[^ ][^ ]*$"
|
||||
}
|
||||
|
||||
##
|
||||
|
@ -1301,9 +1301,9 @@ else
|
|||
fi
|
||||
check_ne "${BASE_SYSTEM_DEVT}" "${BASE_VENDOR_DEVT}" --warning system/vendor devt
|
||||
[ -n "${SYSTEM_DEVT%[0-9a-fA-F][0-9a-fA-F]}" ] ||
|
||||
die "system devt ${SYSTEM_DEVT} is major 0"
|
||||
echo "${YELLOW}[ WARNING ]${NORMAL} system devt ${SYSTEM_DEVT} major 0" >&2
|
||||
[ -n "${VENDOR_DEVT%[0-9a-fA-F][0-9a-fA-F]}" ] ||
|
||||
die "vendor devt ${SYSTEM_DEVT} is major 0"
|
||||
echo "${YELLOW}[ WARNING ]${NORMAL} vendor devt ${VENDOR_DEVT} major 0" >&2
|
||||
|
||||
# Download libc.so, append some gargage, push back, and check if the file
|
||||
# is updated.
|
||||
|
|
Loading…
Reference in New Issue