summaryrefslogtreecommitdiff
path: root/mtectrl
diff options
context:
space:
mode:
authorFlorian Mayer <fmayer@google.com>2023-01-31 15:45:28 -0800
committerFlorian Mayer <fmayer@google.com>2023-01-31 15:47:47 -0800
commit3887562f102f9f9129718dbfec53d7384a70fbfc (patch)
tree58369adf7acc9f9fea53a294e83f0d2fb70bf97e /mtectrl
parent73ecedc8ce14906a9f8b51c35e5b993167c36fc1 (diff)
downloadextras-3887562f102f9f9129718dbfec53d7384a70fbfc.tar.gz
Use bootloader_override from boot namespace
Bug: 267234468 Change-Id: I681a1f5f7749b0aa92b93ef118c0e4cbbaaeaf4a
Diffstat (limited to 'mtectrl')
-rw-r--r--mtectrl/mtectrl.rc8
1 files changed, 4 insertions, 4 deletions
diff --git a/mtectrl/mtectrl.rc b/mtectrl/mtectrl.rc
index a92d72ae..699b56ec 100644
--- a/mtectrl/mtectrl.rc
+++ b/mtectrl/mtectrl.rc
@@ -13,10 +13,10 @@
# limitations under the License.
on property:arm64.memtag.bootctl=*
- exec -- /system/bin/mtectrl ${arm64.memtag.bootctl:-none} ${persist.device_config.memory_safety_native.bootloader_override:-default}
+ exec -- /system/bin/mtectrl ${arm64.memtag.bootctl:-none} ${persist.device_config.memory_safety_native_boot.bootloader_override:-default}
-on property:persist.device_config.memory_safety_native.bootloader_override=*
- exec -- /system/bin/mtectrl ${arm64.memtag.bootctl:-none} ${persist.device_config.memory_safety_native.bootloader_override:-default}
+on property:persist.device_config.memory_safety_native_boot.bootloader_override=*
+ exec -- /system/bin/mtectrl ${arm64.memtag.bootctl:-none} ${persist.device_config.memory_safety_native_boot.bootloader_override:-default}
# adbd gets initialized in init, so run before that. this makes sure that the
# user does not change the value before we initialize it
@@ -24,4 +24,4 @@ on early-init && property:ro.arm64.memtag.bootctl_supported=1
exec -- /system/bin/mtectrl -s arm64.memtag.bootctl
on shutdown && property:ro.arm64.memtag.bootctl_supported=1
- exec -- /system/bin/mtectrl ${arm64.memtag.bootctl:-none} ${persist.device_config.memory_safety_native.bootloader_override:-default}
+ exec -- /system/bin/mtectrl ${arm64.memtag.bootctl:-none} ${persist.device_config.memory_safety_native_boot.bootloader_override:-default}