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

Commit 9a22de52 authored by Paul Lawrence's avatar Paul Lawrence
Browse files

Fix tests for new overlayfs

adb remount used to remount every full or almost full partition.
However, this is not possible with new overlayfs because it would
require a very permissive overlay_remounter policy.

Make component of test that specifically looks for that logging only

Bug: 397158623
Test: system/core/fs_mgr/tests/adb-remount-test.sh on Pixel 6
Change-Id: I0a1d8088fa0a3ce880111254366468268c6bffb9
parent 88d79e02
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -1320,7 +1320,10 @@ if ${overlayfs_needed}; then
  for d in ${D}; do
    if adb_sh tune2fs -l "${d}" </dev/null 2>&1 | grep -q "Filesystem features:.*shared_blocks" ||
        adb_sh df -k "${d}" | grep -q " 100% "; then
      die "remount overlayfs missed a spot (rw)"
      # See b/397158623
      # The new overlayfs mounter is a bit more limited due to sepolicy. Since we know of no use
      # cases for these mounts, disabling for now
      LOG OK "remount overlayfs missed a spot (rw)"
    fi
  done
else