openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "init.rc: start netd and zygote early for file based encryption devices" am: 4bf2bc078f 

am: 1a65e43878

Change-Id: I2d2aabda97c7a650aa9812a2d84d60db8ced9d2a
This commit is contained in:
Wei Wang 2017-03-09 06:20:56 +00:00 committed by android-build-merger
parent 1323b630b0 1a65e43878
commit 3b272c7bf8
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rootdir/init.rc
View File

@ -290,8 +290,7 @@ on late-init
# /data, which in turn can only be loaded when system properties are present.
trigger post-fs-data
# Now we can start zygote for file base encryption devices in
# init.{$device}.rc
# Now we can start zygote for devices with file based encryption
trigger zygote-start
# Load persist properties and override properties (if enabled) from /data.
@ -303,6 +302,12 @@ 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 /