commit 2ab7cb040f6f100eb8f937c4b3dfd1995794497a
author Mark Salyzyn <salyzyn@google.com> Wed Sep 27 20:07:10 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 27 20:07:10 2017 +0000
tree 2f8698defe82eb05be437af8ba303a0b2f9dd561
parent 65284d3b1489f60a1232589ffc57bc3e7c72d903
parent f86661d48c5958a4ca0038c442b488171d18ca4e

Merge "init: report shutdown,container for sigterm of init" am: d2b5a2417f am: 387dbf9ab0 am: a81e227284
am: 25964c7fd8

Change-Id: I7be95a9e0dbe90a45c820d3fbce758b80c8da193

bootstat/bootstat.cpp

diff --git a/bootstat/bootstat.cpp b/bootstat/bootstat.cpp
index 7c0b15e..17986b9 100644
--- a/bootstat/bootstat.cpp
+++ b/bootstat/bootstat.cpp
@@ -204,6 +204,7 @@
     {"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

diff --git a/init/init.cpp b/init/init.cpp
index e611f18..ad045b1 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -417,8 +417,7 @@
         return;
     }
 
-    LOG(INFO) << "Handling SIGTERM, shutting system down";
-    HandlePowerctlMessage("shutdown");
+    HandlePowerctlMessage("shutdown,container");
 }
 
 static void InstallSigtermHandler() {