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

Merge "init: fix crash when reboot is triggered by a builtin" am: b92415cee2

Browse source 
am: 171587d10e

Change-Id: I000070eca639e129efe50249ecc16a28cfadc6d3
This commit is contained in:
Tom Cherry 2017-09-15 21:18:47 +00:00 • committed by android-build-merger
commit e50fd398ef
2 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
init/builtins.cpp
View file

@ -267,7 +267,7 @@ static Result<Success> do_mkdir(const std::vector<std::string>& args) {
"--prompt_and_wipe_data", "--prompt_and_wipe_data",
"--reason=set_policy_failed:"s + args[1]}; "--reason=set_policy_failed:"s + args[1]};
reboot_into_recovery(options); reboot_into_recovery(options);
return Error() << "reboot into recovery failed"; return Success();
} }
} }
return Success(); return Success();
@ -472,7 +472,7 @@ static Result<Success> queue_fs_event(int code) {
PLOG(ERROR) << "fs_mgr_mount_all suggested recovery, so wiping data via recovery."; PLOG(ERROR) << "fs_mgr_mount_all suggested recovery, so wiping data via recovery.";
const std::vector<std::string> options = {"--wipe_data", "--reason=fs_mgr_mount_all" }; const std::vector<std::string> options = {"--wipe_data", "--reason=fs_mgr_mount_all" };
reboot_into_recovery(options); reboot_into_recovery(options);
return Error() << "reboot_into_recovery() failed"; return Success();
/* If reboot worked, there is no return. */ /* If reboot worked, there is no return. */
} else if (code == FS_MGR_MNTALL_DEV_FILE_ENCRYPTED) { } else if (code == FS_MGR_MNTALL_DEV_FILE_ENCRYPTED) {
if (e4crypt_install_keyring()) { if (e4crypt_install_keyring()) {

22
init/init.cpp
View file

@ -79,6 +79,8 @@ static std::unique_ptr<Timer> waiting_for_prop(nullptr);
static std::string wait_prop_name; static std::string wait_prop_name;
static std::string wait_prop_value; static std::string wait_prop_value;
static bool shutting_down; static bool shutting_down;
static std::string shutdown_command;
static bool do_shutdown = false;
std::vector<std::string> late_import_paths; std::vector<std::string> late_import_paths;
@ -157,9 +159,16 @@ void property_changed(const std::string& name, const std::string& value) {
// In non-thermal-shutdown case, 'shutdown' trigger will be fired to let device specific // In non-thermal-shutdown case, 'shutdown' trigger will be fired to let device specific
// commands to be executed. // commands to be executed.
if (name == "sys.powerctl") { if (name == "sys.powerctl") {
if (HandlePowerctlMessage(value)) { // Despite the above comment, we can't call HandlePowerctlMessage() in this function,
shutting_down = true; // because it modifies the contents of the action queue, which can cause the action queue
} // to get into a bad state if this function is called from a command being executed by the
// action queue. Instead we set this flag and ensure that shutdown happens before the next
// command is run in the main init loop.
// TODO: once property service is removed from init, this will never happen from a builtin,
// but rather from a callback from the property service socket, in which case this hack can
// go away.
shutdown_command = value;
do_shutdown = true;
} }
if (property_triggers_enabled) ActionManager::GetInstance().QueuePropertyChange(name, value); if (property_triggers_enabled) ActionManager::GetInstance().QueuePropertyChange(name, value);
@ -622,6 +631,13 @@ int main(int argc, char** argv) {
// By default, sleep until something happens. // By default, sleep until something happens.
int epoll_timeout_ms = -1; int epoll_timeout_ms = -1;
if (do_shutdown && !shutting_down) {
do_shutdown = false;
if (HandlePowerctlMessage(shutdown_command)) {
shutting_down = true;
}
}
if (!(waiting_for_prop || Service::is_exec_service_running())) { if (!(waiting_for_prop || Service::is_exec_service_running())) {
am.ExecuteOneCommand(); am.ExecuteOneCommand();
} }