commit 27277e97d3c7450aca22d0121ac07f5ca2e924bb
author Tom Cherry <tomcherry@google.com> Wed May 03 22:28:06 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 03 22:28:06 2017 +0000
tree 68c539f13774d5276566ae0c9e8f3a8791cfff24
parent 0699bc88e1dcff639c925659ccc26f8848c9d11f
parent ce48ca5ecb04eb7b9be9bd7ebea213204ba80845

Merge "init: use do_exec() for init_user0" am: 5ad06cbb1c
am: 577c75e78c

Change-Id: I1a148c39f4f87df388641367bdec6b187723db9e

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 {