Merge "init: Set a property indicating that we're booting into a GSI." am: 1cdd96cb10

am: bf1bcf4cad

Change-Id: Id4f9f0c62c45a26710bcf3c09917493827cc941d
This commit is contained in:
David Anderson 2019-02-25 13:13:36 -08:00 committed by android-build-merger
commit ed49007bef

View file

@ -42,6 +42,7 @@
#include <fs_mgr_vendor_overlay.h>
#include <keyutils.h>
#include <libavb/libavb.h>
#include <libgsi/libgsi.h>
#include <processgroup/processgroup.h>
#include <selinux/android.h>
@ -695,6 +696,13 @@ int SecondStageMain(int argc, char** argv) {
// Nexus 9 boot time, so it's disabled by default.
if (false) DumpState();
// Make the GSI status available before scripts start running.
if (android::gsi::IsGsiRunning()) {
property_set("ro.gsid.image_running", "1");
} else {
property_set("ro.gsid.image_running", "0");
}
am.QueueBuiltinAction(SetupCgroupsAction, "SetupCgroups");
am.QueueEventTrigger("early-init");