From 7f32aa4d046ad8573d6b636b0dfb010a2ea2d28f Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Wed, 8 Mar 2017 14:46:50 -0800 Subject: [PATCH] init.rc: start netd and zygote early for file based encryption devices Bug: 35110957 Test: marlin boots Change-Id: Ibe4c413e41fcf25a68b50d99ee66d9b70706a6a1 --- rootdir/init.rc | 9 +++++++-- 1 file 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 /