Merge "first_stage_mount: Fix log typo "check_at_most_once"" (4bc52771) · Commits · e / os / android_system_core

init/first_stage_mount.cpp

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -507,17 +507,17 @@ bool FirstStageMount::TrySwitchSystemAsRoot() {
	SaveRamdiskPathToSnapuserd();		SaveRamdiskPathToSnapuserd();
	}		}

	if (MountPartition(system_partition, false /* erase_same_mounts */)) {		if (!MountPartition(system_partition, false /* erase_same_mounts */)) {
	if (dsu_not_on_userdata_ && fs_mgr_verity_is_check_at_most_once(*system_partition)) {		PLOG(ERROR) << "Failed to mount /system";
	LOG(ERROR) << "check_most_at_once forbidden on external media";
	return false;		return false;
	}		}
	SwitchRoot("/system");		if (dsu_not_on_userdata_ && fs_mgr_verity_is_check_at_most_once(*system_partition)) {
	} else {		LOG(ERROR) << "check_at_most_once forbidden on external media";
	PLOG(ERROR) << "Failed to mount /system";
	return false;		return false;
	}		}

			SwitchRoot("/system");

	return true;		return true;
	}		}