ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "userspace reboot: unmount apexes and switch to bootstrap namespace"

Browse source
This commit is contained in:
Nikita Ioffe 2019-11-07 12:09:46 +00:00 • committed by Gerrit Code Review
commit 7051bb3d74
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
init/reboot.cpp
View file

@ -57,6 +57,7 @@
#include "action_manager.h"
#include "builtin_arguments.h"
#include "init.h"
#include "mount_namespace.h"
#include "property_service.h"
#include "reboot_utils.h"
#include "service.h"
@ -713,6 +714,18 @@ static void LeaveShutdown() {
SendStartSendingMessagesMessage();
}
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 Result<void> DoUserspaceReboot() {
LOG(INFO) << "Userspace reboot initiated";
auto guard = android::base::make_scope_guard([] {
@ -754,7 +767,12 @@ static Result<void> DoUserspaceReboot() {
// TODO(b/135984674): store information about offending services for debugging.
return Error() << r << " debugging services are still running";
}
// TODO(b/135984674): deactivate APEX modules and switch back to bootstrap namespace.
if (auto result = UnmountAllApexes(); !result) {
return result;
}
if (!SwitchToBootstrapMountNamespaceIfNeeded()) {
return Error() << "Failed to switch to bootstrap namespace";
}
// Re-enable services
for (const auto& s : were_enabled) {
LOG(INFO) << "Re-enabling service '" << s->name() << "'";