Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 161b8626 authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

init: report shutdown,container for sigterm of init 

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
parent 82ee4060

bootstat/bootstat.cpp

+1 −0
Original line number Diff line number Diff line
@@ -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

init/init.cpp

+1 −2
Original line number Diff line number Diff line
@@ -417,8 +417,7 @@ static void HandleSigtermSignal() { 
        return;

    }



    LOG(INFO) << "Handling SIGTERM, shutting system down";

    HandlePowerctlMessage("shutdown");

    HandlePowerctlMessage("shutdown,container");

}



static void InstallSigtermHandler() {