commit 5ad06cbb1c934997e2c0af0608d7c80ce4ee477c
author Treehugger Robot <treehugger-gerrit@google.com> Wed May 03 22:11:05 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 03 22:11:06 2017 +0000
tree a24f0502a70e5354629a455140a9734bb416eab4
parent 672dd970f475a3166f9558affcb0aaafeda4322b
parent 5a86cb7694b31c7506ed5c42241f4e601efa65cb

Merge "init: use do_exec() for init_user0"

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 {