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

init: report shutdown,container for sigterm of init

Browse source 
Change HandleSigtermSignal() handler to report shutdown,container. Add
the new reason to bootstat.  Remove log stutter as
HandlPowerctlMessage will also do a LOG(INFO) reporting
shutdown,container as reason.

Sending SIGTERM to init is to allow a host OS to ask an Android
Container instance to shutdown.  The temptation is to report
shutdown,sigterm but that does not accurately describe the usage
scenario.

Test: compile
Bug: 63736262
Change-Id: I3c5798921bdbef5d2689ad22a2e8103741b570b4
This commit is contained in:
Mark Salyzyn 2017-09-26 08:26:12 -07:00
parent 82ee4060ed
commit 161b8626bd
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bootstat/bootstat.cpp
View file

@ -204,6 +204,7 @@ const std::map<std::string, int32_t> kBootReasonMap = {
{"reboot,shell", 66},
{"reboot,adb", 67},
{"reboot,userrequested", 68},
{"shutdown,container", 69}, // Host OS asking Android Container to shutdown
};
// Converts a string value representing the reason the system booted to an

3
init/init.cpp
View file

@ -417,8 +417,7 @@ static void HandleSigtermSignal() {
return;
}
LOG(INFO) << "Handling SIGTERM, shutting system down";
HandlePowerctlMessage("shutdown");
HandlePowerctlMessage("shutdown,container");
}
static void InstallSigtermHandler() {