Commit 4fd99c91 authored Dec 04, 2023 by Treehugger Robot Committed by Automerger Merge Worker Dec 04, 2023

Merge "fs_mgr_overlayfs: MapScratchPartitionIfNeeded always tries to create...

Merge "fs_mgr_overlayfs: MapScratchPartitionIfNeeded always tries to create scratch" into main am: 3ecba6b9

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

Change-Id: Ieb56d0f6d300c81a5a3e048ffb8e7d35126182de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

fs_mgr/fs_mgr_overlayfs_control.cpp

+0 −15

Original line number	Diff line number	Diff line
		@@ -856,21 +856,6 @@ void MapScratchPartitionIfNeeded(Fstab* fstab,
		return;
		}

		bool want_scratch = false;
		for (const auto& entry : fs_mgr_overlayfs_candidate_list(*fstab)) {
		if (fs_mgr_is_verity_enabled(entry)) {
		continue;
		}
		if (fs_mgr_overlayfs_already_mounted(fs_mgr_mount_point(entry.mount_point))) {
		continue;
		}
		want_scratch = true;
		break;
		}
		if (!want_scratch) {
		return;
		}

		if (ScratchIsOnData()) {
		if (auto images = IImageManager::Open("remount", 0ms)) {
		images->MapAllImages(init);