Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00b74988 authored by Maciej Żenczykowski's avatar Maciej Żenczykowski Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I27d130c076103b83ecab765264f2a3d68eeab40e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d679e60b 3e8f0b53

init/README.md

+4 −3
Original line number Diff line number Diff line
@@ -501,9 +501,10 @@ have been omitted. 
      reformatted here if it couldn't mount in first-stage init.

   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.

   7. `zygote-start` - Start the zygote.

   8. `early-boot` - After zygote has started.

   9. `boot` - After `early-boot` actions have completed.

   7. `bpf-progs-loaded` - Starts things that want to start ASAP but need eBPF (incl. netd)

   8. `zygote-start` - Start the zygote.

   9. `early-boot` - After zygote has started.

  10. `boot` - After `early-boot` actions have completed.



Commands

--------

rootdir/init.rc

+4 −1
Original line number Diff line number Diff line
@@ -568,6 +568,7 @@ on late-init 


    # Should be before netd, but after apex, properties and logging is available.

    trigger load_bpf_programs

    trigger bpf-progs-loaded



    # Now we can start zygote.

    trigger zygote-start
@@ -1109,6 +1110,9 @@ on post-fs-data 
on property:vold.checkpoint_committed=1

    trigger post-fs-data-checkpointed



on bpf-progs-loaded

    start netd



# 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
@@ -1116,7 +1120,6 @@ on zygote-start 
    # A/B update verifier that marks a successful boot.

    exec_start update_verifier

    start statsd

    start netd

    start zygote

    start zygote_secondary