openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Make init builtin command installkey respect property updates" into oc-dev

This commit is contained in:
Tom Cherry 2017-04-03 21:58:44 +00:00 committed by Android (Google) Code Review
parent ba27df4d0f 650d22bb53
commit 78a215ff55
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
init/builtins.cpp
View File

@ -919,8 +919,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) {