diff options
| author | Tom Cherry <tomcherry@google.com> | 2017-03-31 16:41:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-03-31 16:41:02 +0000 |
| commit | cf29755e281a2027e79f8fbe5863ae37a8a72f62 (patch) | |
| tree | c140516e2b6e7154d0b5854f416f5924729da560 /init/builtins.cpp | |
| parent | 5c4af9698ccfe9bbacc74b1e0558597eaabfa073 (diff) | |
| parent | 9cc51728af87d476de1b90e0f8dba62b3fc8711f (diff) | |
Merge "Make init builtin command installkey respect property updates"
Diffstat (limited to 'init/builtins.cpp')
| -rw-r--r-- | init/builtins.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp index d8569d7b9..dc2bda644 100644 --- a/init/builtins.cpp +++ b/init/builtins.cpp @@ -929,8 +929,14 @@ static int do_installkey(const std::vector<std::string>& args) { if (!is_file_crypto()) { return 0; } - return e4crypt_create_device_key(args[1].c_str(), - do_installkeys_ensure_dir_exists); + auto unencrypted_dir = args[1] + e4crypt_unencrypted_folder; + if (do_installkeys_ensure_dir_exists(unencrypted_dir.c_str())) { + PLOG(ERROR) << "Failed to create " << unencrypted_dir; + return -1; + } + std::vector<std::string> exec_args = {"exec", "/system/bin/vdc", "--wait", "cryptfs", + "enablefilecrypto"}; + return do_exec(exec_args); } static int do_init_user0(const std::vector<std::string>& args) { |