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

Commit c45d916f authored by Yi-Yo Chiang's avatar Yi-Yo Chiang Committed by Automerger Merge Worker
Browse files

Merge "fs_mgr: Use /proc/mounts to check if /cache is mounted" into main am:... 

Merge "fs_mgr: Use /proc/mounts to check if /cache is mounted" into main am: 7881073e am: ed0de0be am: 89dccffd am: 35511b65

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



Change-Id: I9789822830aa66248c7bc26dd2543579f04b78a9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 497664d5 35511b65

fs_mgr/fs_mgr_overlayfs_control.cpp

+1 −1
Original line number Diff line number Diff line
@@ -688,7 +688,7 @@ bool fs_mgr_overlayfs_setup(const Fstab& fstab, const char* mount_point, bool* w 
                continue;

            }

        } else {

            if (GetEntryForMountPoint(&fstab, overlay_mount_point) == nullptr) {

            if (!fs_mgr_overlayfs_already_mounted(overlay_mount_point, false /* overlay */)) {

                continue;

            }

        }