commit cf29755e281a2027e79f8fbe5863ae37a8a72f62
author Tom Cherry <tomcherry@google.com> Fri Mar 31 16:41:00 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 31 16:41:02 2017 +0000
tree c140516e2b6e7154d0b5854f416f5924729da560
parent 5c4af9698ccfe9bbacc74b1e0558597eaabfa073
parent 9cc51728af87d476de1b90e0f8dba62b3fc8711f

Merge "Make init builtin command installkey respect property updates"

init/builtins.cpp

diff --git a/init/builtins.cpp b/init/builtins.cpp
index d8569d7..dc2bda6 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -929,8 +929,14 @@
     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) {