tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

Change-Id: I9d00003dc80bfec97fb56e9049b4bef8160b79f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-10-20 17:51:01 +00:00 committed by Automerger Merge Worker
commit 054526a660
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs_mgr/fs_mgr_overlayfs_mount.cpp
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);