| commit | ed0de0be903369a9e9e3a27f51c20b05be1eb2c3 | [log] [tgz] |
|---|---|---|
| author | Yi-Yo Chiang <yochiang@google.com> | Wed Sep 13 07:08:14 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 13 07:08:14 2023 +0000 |
| tree | 84c4648392fdb7dfa9fc693aa1a4a13a307d47dc | |
| parent | 40aa3a71251e16e7be23ab00e70e39d98b7398d2 [diff] | |
| parent | 7881073ec83d1c574a3d2204ecbf9a4864b4aa43 [diff] |
Merge "fs_mgr: Use /proc/mounts to check if /cache is mounted" into main am: 7881073ec8 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2745619 Change-Id: Ica993eb012ed1dba6e86b7378ab96e6a4c7c2678 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; } }