Merge "Get the correct fstab entry if there are more than one" into main am: 41d3e8d1e5
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/3059764 Change-Id: Ic082f8803bfddf523f6016d4924dbcf9abc036ae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
f7c7ae7801
1 changed files with 2 additions and 1 deletions
|
@ -198,7 +198,8 @@ Status cp_commitChanges() {
|
||||||
|
|
||||||
// Walk mounted file systems
|
// Walk mounted file systems
|
||||||
for (const auto& mount_rec : mounts) {
|
for (const auto& mount_rec : mounts) {
|
||||||
const auto fstab_rec = GetEntryForMountPoint(&fstab_default, mount_rec.mount_point);
|
const auto fstab_rec =
|
||||||
|
GetEntryForMountPoint(&fstab_default, mount_rec.mount_point, mount_rec.fs_type);
|
||||||
if (!fstab_rec) continue;
|
if (!fstab_rec) continue;
|
||||||
|
|
||||||
if (fstab_rec->fs_mgr_flags.checkpoint_fs) {
|
if (fstab_rec->fs_mgr_flags.checkpoint_fs) {
|
||||||
|
|
Loading…
Reference in a new issue