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

Commit 6b1c1007 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove space check from overlayfs test" into main am: adc9a64d am: fa5ac510 

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



Change-Id: I6b9e7414b6ebb10d8c1a4360b2e670bb43ae892e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 87f9a540 fa5ac510

fs_mgr/fs_mgr_overlayfs_mount.cpp

+2 −3
Original line number Diff line number Diff line
@@ -194,9 +194,8 @@ static bool fs_mgr_is_read_only_f2fs(const std::string& dev) { 


static bool fs_mgr_overlayfs_enabled(FstabEntry* entry) {

    // readonly filesystem, can not be mount -o remount,rw

    // for squashfs, erofs or if free space is (near) zero making such a remount

    // virtually useless, or if there are shared blocks that prevent remount,rw

    if (!fs_mgr_filesystem_has_space(entry->mount_point)) {

    // for squashfs, erofs, or if there are shared blocks that prevent remount,rw

    if (entry->fs_type == "erofs" || entry->fs_type == "squashfs") {

        return true;

    }