summaryrefslogtreecommitdiff
path: root/mtectrl/mtectrl.rc
diff options
context:
space:
mode:
Diffstat (limited to 'mtectrl/mtectrl.rc')
-rw-r--r--mtectrl/mtectrl.rc5
1 files changed, 4 insertions, 1 deletions
diff --git a/mtectrl/mtectrl.rc b/mtectrl/mtectrl.rc
index 050993d1..38c58f7a 100644
--- a/mtectrl/mtectrl.rc
+++ b/mtectrl/mtectrl.rc
@@ -13,17 +13,20 @@
# limitations under the License.
on property:arm64.memtag.bootctl=*
+ wait_for_prop arm64.memtag.bootctl_loaded 1
exec -- /system/bin/mtectrl ${arm64.memtag.bootctl:-none} ${persist.device_config.runtime_native_boot.bootloader_override:-default}
on property:persist.device_config.runtime_native_boot.bootloader_override=*
+ wait_for_prop arm64.memtag.bootctl_loaded 1
exec -- /system/bin/mtectrl ${arm64.memtag.bootctl:-none} ${persist.device_config.runtime_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
on early-init && property:ro.arm64.memtag.bootctl_supported=1
- exec -- /system/bin/mtectrl -s arm64.memtag.bootctl
+ exec_background -- /system/bin/mtectrl -s arm64.memtag.bootctl -f arm64.memtag.bootctl_loaded
on shutdown && property:ro.arm64.memtag.bootctl_supported=1
+ # This doesn't use wait_for_prop to not stall the shutdown.
exec -- /system/bin/mtectrl ${arm64.memtag.bootctl:-none} ${persist.device_config.runtime_native_boot.bootloader_override:-default}
on property:persist.device_config.runtime_native_boot.bootloader_override=force_on