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

Merge "start netd earlier" into main am: 3e8f0b53e4

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

Change-Id: I27d130c076103b83ecab765264f2a3d68eeab40e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Maciej Żenczykowski 2024-09-23 21:30:52 +00:00 • committed by Automerger Merge Worker
commit 00b74988dc
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
init/README.md
View file

@ -501,9 +501,10 @@ have been omitted.
reformatted here if it couldn't mount in first-stage init. reformatted here if it couldn't mount in first-stage init.
6. `post-fs-data-checkpointed` - Triggered when vold has completed committing a checkpoint 6. `post-fs-data-checkpointed` - Triggered when vold has completed committing a checkpoint
after an OTA update. Not triggered if checkpointing is not needed or supported. after an OTA update. Not triggered if checkpointing is not needed or supported.
7. `zygote-start` - Start the zygote. 7. `bpf-progs-loaded` - Starts things that want to start ASAP but need eBPF (incl. netd)
8. `early-boot` - After zygote has started. 8. `zygote-start` - Start the zygote.
9. `boot` - After `early-boot` actions have completed. 9. `early-boot` - After zygote has started.
10. `boot` - After `early-boot` actions have completed.
Commands Commands
-------- --------

5
rootdir/init.rc
View file

@ -568,6 +568,7 @@ on late-init
# Should be before netd, but after apex, properties and logging is available. # Should be before netd, but after apex, properties and logging is available.
trigger load_bpf_programs trigger load_bpf_programs
trigger bpf-progs-loaded
# Now we can start zygote. # Now we can start zygote.
trigger zygote-start trigger zygote-start
@ -1109,6 +1110,9 @@ on post-fs-data
on property:vold.checkpoint_committed=1 on property:vold.checkpoint_committed=1
trigger post-fs-data-checkpointed trigger post-fs-data-checkpointed
on bpf-progs-loaded
start netd
# It is recommended to put unnecessary data/ initialization from 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. # to start-zygote in device's init.rc to unblock zygote start.
on zygote-start on zygote-start
@ -1116,7 +1120,6 @@ on zygote-start
# A/B update verifier that marks a successful boot. # A/B update verifier that marks a successful boot.
exec_start update_verifier exec_start update_verifier
start statsd start statsd
start netd
start zygote start zygote
start zygote_secondary start zygote_secondary