diff options
| author | Yusuke Sato <yusukes@google.com> | 2015-08-19 22:20:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-19 22:20:29 +0000 |
| commit | 9962b04d00d6ee16f347637784049a35548c3f2d (patch) | |
| tree | 8c1b5b68b133a8076761e63953b7e491edf56a99 /init/builtins.cpp | |
| parent | 178c05ac9a3c5c1e650400e6c81b4e0b490f20f7 (diff) | |
| parent | d1b11a04903be74ba6a47307d8c3ef2731e3f4ab (diff) | |
am d1b11a04: am e656be33: Merge "Add |opts| argument to android_fork_execvp_ext"
* commit 'd1b11a04903be74ba6a47307d8c3ef2731e3f4ab':
Add |opts| argument to android_fork_execvp_ext
Diffstat (limited to 'init/builtins.cpp')
| -rw-r--r-- | init/builtins.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp index c02f05e76..ecfac50b7 100644 --- a/init/builtins.cpp +++ b/init/builtins.cpp @@ -150,13 +150,13 @@ static void unmount_and_fsck(const struct mntent *entry) "/system/bin/fsck.f2fs", "-f", entry->mnt_fsname, }; android_fork_execvp_ext(ARRAY_SIZE(f2fs_argv), (char **)f2fs_argv, - &st, true, LOG_KLOG, true, NULL); + &st, true, LOG_KLOG, true, NULL, NULL, 0); } else if (!strcmp(entry->mnt_type, "ext4")) { const char *ext4_argv[] = { "/system/bin/e2fsck", "-f", "-y", entry->mnt_fsname, }; android_fork_execvp_ext(ARRAY_SIZE(ext4_argv), (char **)ext4_argv, - &st, true, LOG_KLOG, true, NULL); + &st, true, LOG_KLOG, true, NULL, NULL, 0); } } |