commit 577c75e78c91f7c4eb926f19ec782bee9ab2606d
author Tom Cherry <tomcherry@google.com> Wed May 03 22:25:36 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 03 22:25:36 2017 +0000
tree a24f0502a70e5354629a455140a9734bb416eab4
parent e4988c9a341d1893d54ec8dbd607900b4e59576b
parent 5ad06cbb1c934997e2c0af0608d7c80ce4ee477c

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

Change-Id: Id75cd629df7c73bdc2c7fe4fd8438f44a8c811b7

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 {