diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-03-09 06:12:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-03-09 06:12:33 +0000 |
| commit | 4bf2bc078f418ebc42a3b8b1f1deaa421c4966e6 (patch) | |
| tree | 53c894e9cec2501471e98e128d4f002e9f051e9c | |
| parent | 59aea45254dceec59b7776476d654c911ba6bf6d (diff) | |
| parent | 7f32aa4d046ad8573d6b636b0dfb010a2ea2d28f (diff) | |
| download | system_core-4bf2bc078f418ebc42a3b8b1f1deaa421c4966e6.tar.gz system_core-4bf2bc078f418ebc42a3b8b1f1deaa421c4966e6.tar.bz2 system_core-4bf2bc078f418ebc42a3b8b1f1deaa421c4966e6.zip | |
Merge "init.rc: start netd and zygote early for file based encryption devices"
| -rw-r--r-- | rootdir/init.rc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc index c025d1379..f1b047e9d 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -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 / |