diff options
| author | Tom Cherry <tomcherry@google.com> | 2017-05-03 22:35:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-03 22:35:58 +0000 |
| commit | fd9ffbb9175b41ac28b5a97cdde24c0219d0ae60 (patch) | |
| tree | ba84f79a5e477d1aeeffbf6b551910d9f16a534b /init/builtins.cpp | |
| parent | 5f937acbc2dbc8c351ba890bb41f405148fc92a4 (diff) | |
| parent | 10cdd5bbf1a6da2a7a67a1d4ab2efaecdb9aaa70 (diff) | |
Merge "init: use do_exec() for init_user0" am: 5ad06cbb1c am: 577c75e78c am: bc8a4ad7aa
am: 10cdd5bbf1
Change-Id: I3fa46dc57426738550beffb71932e06a0407c68c
Diffstat (limited to 'init/builtins.cpp')
| -rw-r--r-- | init/builtins.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp index 2e41ca442..9a2355b81 100644 --- a/init/builtins.cpp +++ b/init/builtins.cpp @@ -852,7 +852,9 @@ static int do_installkey(const std::vector<std::string>& args) { } 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 { |