tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "init: call umount unconditionally"

Browse source
This commit is contained in:
Treehugger Robot 2017-10-24 02:07:48 +00:00 committed by Gerrit Code Review
commit b409e5e00b
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
init/reboot.cpp
View file

@ -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;
}