ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "init.rc: merge the zygote-start actions" into main am: 620ea56515 am: 6d086b5ab1

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

Change-Id: I696ff93a51f9fbdef72c5178b7c063f0be1ab1a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eric Biggers 2023-07-11 17:31:30 +00:00 • committed by Automerger Merge Worker
commit 1dfec1d8ef
1 changed files with 2 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
rootdir/init.rc
View file

@ -533,7 +533,7 @@ on late-init
# Should be before netd, but after apex, properties and logging is available.
trigger load_bpf_programs
# Now we can start zygote for devices with file based encryption
# Now we can start zygote.
trigger zygote-start
# Remove a file to wake up anything waiting for firmware.
@ -1056,25 +1056,7 @@ on post-fs-data
# It is recommended to put unnecessary data/ initialization from post-fs-data
# to start-zygote in device's init.rc to unblock zygote start.
on zygote-start && property:ro.crypto.state=unencrypted
wait_for_prop odsign.verification.done 1
# A/B update verifier that marks a successful boot.
exec_start update_verifier_nonencrypted
start statsd
start netd
start zygote
start zygote_secondary
on zygote-start && property:ro.crypto.state=unsupported
wait_for_prop odsign.verification.done 1
# A/B update verifier that marks a successful boot.
exec_start update_verifier_nonencrypted
start statsd
start netd
start zygote
start zygote_secondary
on zygote-start && property:ro.crypto.state=encrypted && property:ro.crypto.type=file
on zygote-start
wait_for_prop odsign.verification.done 1
# A/B update verifier that marks a successful boot.
exec_start update_verifier_nonencrypted