commit 8c765c26783d6d5b0f1fd419edaebfc659493b95
author Treehugger Robot <treehugger-gerrit@google.com> Wed May 03 23:24:13 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 03 23:24:14 2017 +0000
tree cfeda341cc4156f9c7f936c75c7d7ccf0f6378ec
parent 75dbb4962991226ef3ac86d118f02aeefd250dba
parent 12346fddc93fdf7699c4120ca6f08a476296b068

Merge changes Ieb44fa8f,I01b26fe5

* changes:
  init: setup keyring before ueventd starts
  logd: refine permissions to access /data/system/packages.list

init/builtins.cpp

diff --git a/init/builtins.cpp b/init/builtins.cpp
index 559fb84..3dadfd7 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -835,7 +835,9 @@
 }
 
 static int do_init_user0(const std::vector<std::string>& args) {
-    return e4crypt_do_init_user0();
+    std::vector<std::string> exec_args = {"exec", "/system/bin/vdc", "--wait", "cryptfs",
+                                          "init_user0"};
+    return do_exec(exec_args);
 }
 
 const BuiltinFunctionMap::Map& BuiltinFunctionMap::map() const {