commit 10cdd5bbf1a6da2a7a67a1d4ab2efaecdb9aaa70
author Tom Cherry <tomcherry@google.com> Wed May 03 22:30:41 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 03 22:30:41 2017 +0000
tree a3658f20f8ac231393759f1a989447fcb5836007
parent 21fff17ed6f4cac8dd75f64b6c2d8df8e53048f0
parent bc8a4ad7aa71f3c2927c9d2e8299dc9cb4494032

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

Change-Id: I9985eb2751d14c6562b7559ffa6d0c72253df591

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 {