summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Mayer <fmayer@google.com>2023-09-28 06:01:31 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-09-28 06:01:31 +0000
commitc1049f19e1ff83de613ab77292c5e386facdd911 (patch)
tree354e38299dbadddb7c913356a83ac69443d242a4
parenta14b14c067e73fc577686e95b524528e4d885699 (diff)
parentfd6ea7e04e590f4794c1761327aba97da93c935f (diff)
downloadextras-tmp_amf_298295554.tar.gz
Merge "Run mtectrl later in boot sequence" into main am: fd6ea7e04etmp_amf_298295554
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2765456 Change-Id: If42b8e6066cd01af4b2273d02c53f312374150e3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--mtectrl/mtectrl.rc2
1 files changed, 1 insertions, 1 deletions
diff --git a/mtectrl/mtectrl.rc b/mtectrl/mtectrl.rc
index cba3e255..9a85d224 100644
--- a/mtectrl/mtectrl.rc
+++ b/mtectrl/mtectrl.rc
@@ -22,7 +22,7 @@ on property:persist.device_config.runtime_native_boot.bootloader_override=*
# adbd gets initialized in init, so run before that. this makes sure that the
# user does not change the value before we initialize it
-on early-init && property:ro.arm64.memtag.bootctl_supported=1
+on early-boot && property:ro.arm64.memtag.bootctl_supported=1
exec_background -- /system/bin/mtectrl -s arm64.memtag.bootctl -f arm64.memtag.bootctl_loaded
on shutdown && property:ro.arm64.memtag.bootctl_supported=1