| commit | a7c39cdd39224f9273de19cd063612f71479750c | [log] [tgz] |
|---|---|---|
| author | Yi-Yo Chiang <yochiang@google.com> | Wed Sep 13 10:33:32 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 13 10:33:32 2023 +0000 |
| tree | bdc0061ae926e27d51d4a09f3d06bd743c53fdf7 | |
| parent | 1d3b8ecc9c5e12cd5a4137fdae1bb1361e9c19bc [diff] | |
| parent | c45d916fe66c92f392386065174da3f200d9c214 [diff] |
Merge "fs_mgr: Use /proc/mounts to check if /cache is mounted" into main am: 7881073ec8 am: ed0de0be90 am: 89dccffdbd am: 35511b65d3 am: c45d916fe6 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2745619 Change-Id: Ifcb52285b1d2eb797d858fc08b40103ac40c2cd0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/fs_mgr/fs_mgr_overlayfs_control.cpp b/fs_mgr/fs_mgr_overlayfs_control.cpp index 68576f2..2cc0d2d 100644 --- a/fs_mgr/fs_mgr_overlayfs_control.cpp +++ b/fs_mgr/fs_mgr_overlayfs_control.cpp
@@ -688,7 +688,7 @@ continue; } } else { - if (GetEntryForMountPoint(&fstab, overlay_mount_point) == nullptr) { + if (!fs_mgr_overlayfs_already_mounted(overlay_mount_point, false /* overlay */)) { continue; } }