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

Merge "Reboot sequence: Unmount active apexes before unmounting /data"

Browse source
This commit is contained in:
Nikita Ioffe 2020-06-13 20:50:21 +00:00 committed by Gerrit Code Review
commit b255195375
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
init/reboot.cpp
View file

@ -544,6 +544,18 @@ static int StopServicesAndLogViolations(const std::vector<Service*>& services,
return still_running;
}
static Result<void> UnmountAllApexes() {
const char* args[] = {"/system/bin/apexd", "--unmount-all"};
int status;
if (logwrap_fork_execvp(arraysize(args), args, &status, false, LOG_KLOG, true, nullptr) != 0) {
return ErrnoError() << "Failed to call '/system/bin/apexd --unmount-all'";
}
if (WIFEXITED(status) && WEXITSTATUS(status) == 0) {
return {};
}
return Error() << "'/system/bin/apexd --unmount-all' failed : " << status;
}
//* Reboot / shutdown the system.
// cmd ANDROID_RB_* as defined in android_reboot.h
// reason Reason string like "reboot", "shutdown,userrequested"
@ -698,6 +710,11 @@ static void DoReboot(unsigned int cmd, const std::string& reason, const std::str
// 5. drop caches and disable zram backing device, if exist
KillZramBackingDevice();
LOG(INFO) << "Ready to unmount apexes. So far shutdown sequence took " << t;
// 6. unmount active apexes, otherwise they might prevent clean unmount of /data.
if (auto ret = UnmountAllApexes(); !ret.ok()) {
LOG(ERROR) << ret.error();
}
UmountStat stat =
TryUmountAndFsck(cmd, run_fsck, shutdown_timeout - t.duration(), &reboot_semaphore);
// Follow what linux shutdown is doing: one more sync with little bit delay
@ -736,18 +753,6 @@ static void LeaveShutdown() {
StartSendingMessages();
}
static Result<void> UnmountAllApexes() {
const char* args[] = {"/system/bin/apexd", "--unmount-all"};
int status;
if (logwrap_fork_execvp(arraysize(args), args, &status, false, LOG_KLOG, true, nullptr) != 0) {
return ErrnoError() << "Failed to call '/system/bin/apexd --unmount-all'";
}
if (WIFEXITED(status) && WEXITSTATUS(status) == 0) {
return {};
}
return Error() << "'/system/bin/apexd --unmount-all' failed : " << status;
}
static std::chrono::milliseconds GetMillisProperty(const std::string& name,
std::chrono::milliseconds default_value) {
auto value = GetUintProperty(name, static_cast<uint64_t>(default_value.count()));