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

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

Browse source 
am: f58280e7dc

Change-Id: I8925325eec13607ae9a048091f178d52778b41ac
This commit is contained in:
Wei Wang 2017-03-09 23:32:35 +00:00 • committed by android-build-merger
commit 449b59873f
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
rootdir/init.rc
View file

@ -302,12 +302,6 @@ on late-init
trigger early-boot trigger early-boot
trigger 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 on post-fs
start logd start logd
# once everything is setup, no need to modify / # 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 # Set indication (checked by vold) that we have finished this action
#setprop vold.post_fs_data_done 1 #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 on boot
# basic network init # basic network init
ifup lo ifup lo