Merge "fs_mgr_overlayfs: Don't try to mount scratch if already mounted" into main

This commit is contained in:
Treehugger Robot 2023-10-20 17:36:00 +00:00 committed by Gerrit Code Review
commit 7bcd7715f8

View file

@ -707,7 +707,7 @@ bool fs_mgr_overlayfs_mount_all(Fstab* fstab) {
return false;
}
auto ret = true;
auto scratch_can_be_mounted = true;
auto scratch_can_be_mounted = !fs_mgr_overlayfs_already_mounted(kScratchMountPoint, false);
for (const auto& entry : fs_mgr_overlayfs_candidate_list(*fstab)) {
if (fs_mgr_is_verity_enabled(entry)) continue;
auto mount_point = fs_mgr_mount_point(entry.mount_point);