commit 89852696c85d12c49ea18a2021ba3339ac2efd31
author Tom Cherry <tomcherry@google.com> Wed May 03 22:35:58 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 03 22:35:58 2017 +0000
tree ba84f79a5e477d1aeeffbf6b551910d9f16a534b
parent a6da18548289a8c864aadc9d79d1f2ab8537e7a4
parent 563fee79e51f85c0fb35cc300603a21981fc4f8f

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

Change-Id: I3fa46dc57426738550beffb71932e06a0407c68c

init/builtins.cpp

diff --git a/init/builtins.cpp b/init/builtins.cpp
index 2e41ca4..9a2355b 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -852,7 +852,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 {