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

Commit 31665189 authored by Wei Wang's avatar Wei Wang Committed by android-build-merger
Browse files

Merge "init: call umount unconditionally" am: b409e5e0 

am: 121ff413

Change-Id: I9a1da7d6ffa4af9968d7b07adf44494ef61df312
parents dbc4b45c 121ff413

init/reboot.cpp

+6 −6
Original line number Diff line number Diff line
@@ -280,16 +280,16 @@ static UmountStat UmountPartitions(std::chrono::milliseconds timeout) { 
        }

        bool unmount_done = true;

        if (emulated_devices.size() > 0) {

            unmount_done = std::all_of(emulated_devices.begin(), emulated_devices.end(),

                                       [](auto& entry) { return entry.Umount(false); });

            for (auto& entry : emulated_devices) {

                if (!entry.Umount(false)) unmount_done = false;

            }

            if (unmount_done) {

                sync();

            }

        }

        unmount_done =

            std::all_of(block_devices.begin(), block_devices.end(),

                        [&timeout](auto& entry) { return entry.Umount(timeout == 0ms); }) &&

            unmount_done;

        for (auto& entry : block_devices) {

            if (!entry.Umount(timeout == 0ms)) unmount_done = false;

        }

        if (unmount_done) {

            return UMOUNT_STAT_SUCCESS;

        }