commit f8de8dd950da1d239ee3dee8ca8fae00a86708c0
author Randall Huang <huangrandall@google.com> Thu Jan 17 09:23:00 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Jan 17 09:23:00 2019 -0800
tree 61243fd267f32f3ba06f1e5bd92da75274ecf07c
parent ef227c1ba2a6fc235b452e309a5a4f9154fca194
parent 4e8699d860594f12905ec99d48ac53cc4972548b

Merge "reboot: only run fsck when detecting filesystem inconsistency" am: 91b5adfc88 am: a030ede795
am: 96b87d510c

Change-Id: I17b53b5d7b9bc091fc9b67fc334c94e17826ff22

init/reboot.cpp

diff --git a/init/reboot.cpp b/init/reboot.cpp
index 45dc6d3..008a868 100644
--- a/init/reboot.cpp
+++ b/init/reboot.cpp
@@ -103,13 +103,17 @@
         int st;
         if (IsF2Fs()) {
             const char* f2fs_argv[] = {
-                "/system/bin/fsck.f2fs", "-f", mnt_fsname_.c_str(),
+                    "/system/bin/fsck.f2fs",
+                    "-a",
+                    mnt_fsname_.c_str(),
             };
             android_fork_execvp_ext(arraysize(f2fs_argv), (char**)f2fs_argv, &st, true, LOG_KLOG,
                                     true, nullptr, nullptr, 0);
         } else if (IsExt4()) {
             const char* ext4_argv[] = {
-                "/system/bin/e2fsck", "-f", "-y", mnt_fsname_.c_str(),
+                    "/system/bin/e2fsck",
+                    "-y",
+                    mnt_fsname_.c_str(),
             };
             android_fork_execvp_ext(arraysize(ext4_argv), (char**)ext4_argv, &st, true, LOG_KLOG,
                                     true, nullptr, nullptr, 0);