Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96b87d51 authored by Randall Huang's avatar Randall Huang Committed by android-build-merger
Browse files

Merge "reboot: only run fsck when detecting filesystem inconsistency" am: 91b5adfc 

am: a030ede7

Change-Id: Ideab753a0b71dcb5cf26e3f05679497cc204da96
parents c5be1c51 a030ede7

init/reboot.cpp

+6 −2
Original line number Diff line number Diff line
@@ -103,13 +103,17 @@ class MountEntry { 
        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);