commit 67e9ad3dbdc9c365d4c9a4191c5ccfaedc4391e6
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jan 18 19:59:38 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 18 19:59:38 2017 +0000
tree 65b2e5ffdaa8bc68ff712349224c8aa265f61563
parent 284aa4a5d247feba909dfb26bb7425002c5d925a
parent 8040206d8c2ff8ffcb219fb2da426d8f00887c1f

Merge "ext4_utils: add logging in forked command"

ext4_utils/ext4_crypt_init_extensions.cpp

diff --git a/ext4_utils/ext4_crypt_init_extensions.cpp b/ext4_utils/ext4_crypt_init_extensions.cpp
index e98db6e..ddbbd9a 100644
--- a/ext4_utils/ext4_crypt_init_extensions.cpp
+++ b/ext4_utils/ext4_crypt_init_extensions.cpp
@@ -52,7 +52,8 @@
     }
 
     const char* argv[] = { "/system/bin/vdc", "--wait", "cryptfs", "enablefilecrypto" };
-    int rc = android_fork_execvp(4, (char**) argv, NULL, false, true);
+    int rc = android_fork_execvp_ext(arraysize(argv), (char**) argv, NULL, false,
+                                     LOG_KLOG, false, NULL, NULL, 0);
     LOG(INFO) << "enablefilecrypto result: " << rc;
     return rc;
 }
@@ -75,7 +76,8 @@
 int e4crypt_do_init_user0()
 {
     const char* argv[] = { "/system/bin/vdc", "--wait", "cryptfs", "init_user0" };
-    int rc = android_fork_execvp(4, (char**) argv, NULL, false, true);
+    int rc = android_fork_execvp_ext(arraysize(argv), (char**) argv, NULL, false,
+                                     LOG_KLOG, false, NULL, NULL, 0);
     LOG(INFO) << "init_user0 result: " << rc;
     return rc;
 }