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

Commit b409e5e0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "init: call umount unconditionally"

parents c2a2ecb7 25dc30f3
Loading
Loading
Loading
Loading
+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;
        }