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

Commit bae9ba34 authored by Wei Wang's avatar Wei Wang
Browse files

init.rc: make sure netd start after post-fs-data 

Current init doesn't order the triggeres it scaned, and there is no
guarantee that general event trigger exec first and then event+property
triggers.

This CL will make sure netd started after post-fs-data trigger is done.

Bug: 35110957
Test: marlin boots
Change-Id: I7bb55af4e00f336682388abfa8a06eac2136b7d4
parent c1b3c8ef

rootdir/init.rc

+7 −6
Original line number Diff line number Diff line
@@ -302,12 +302,6 @@ on late-init 
    trigger early-boot

    trigger boot



on post-fs-data && property:ro.crypto.state=encrypted && property:ro.crypto.type=file

    start netd



on zygote-start && property:ro.crypto.state=encrypted && property:ro.crypto.type=file

    start zygote



on post-fs

    start logd

    # once everything is setup, no need to modify /
@@ -499,6 +493,13 @@ on post-fs-data 
    # Set indication (checked by vold) that we have finished this action

    #setprop vold.post_fs_data_done 1



# This trigger will be triggered before 'zygote-start' since there is no zygote-start defined in

# current init.rc. It is recommended to put unnecessary data/ initialization from post-fs-data

# to start-zygote to unblock zygote start.

on zygote-start && property:ro.crypto.state=encrypted && property:ro.crypto.type=file

   start netd

   start zygote



on boot

    # basic network init

    ifup lo