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

Commit 464dbd96 authored by Paul Lawrence's avatar Paul Lawrence Committed by Automerger Merge Worker
Browse files

Merge "Fix tests for new overlayfs" into main am: 9e6bd0b8 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3498047



Change-Id: I153eddb367f3e0258ac6c8c0749bd15993b2a2db
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8f2e4891 9e6bd0b8

fs_mgr/tests/adb-remount-test.sh

+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