[automerger skipped] Merge "Merge "Merge "libcutils_test: static libjsoncpp" into android12-tests-dev am: 9825551dbf" into android12L-tests-dev am: 50cac03f37" into android13-tests-dev am: 2520bfb0d9 am: 1400b2dcaa am: 1f80c8bfbf am: 4e9b58603e -s ours am: aa42e3d158 -s ours am: f99938c88d -s ours
am skip reason: Merged-In Ic84901ce5af766338b2cab07c3cf10841ba9a150 with SHA-1 447b4a4bf0 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2617475
Change-Id: If1a760bbc5304a475a2a6b1c808ff51f3d9f1977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/init/init.cpp b/init/init.cpp
index be1ebee..da63fdc 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -1043,6 +1043,12 @@
SetProperty(gsi::kGsiBootedProp, is_running);
auto is_installed = android::gsi::IsGsiInstalled() ? "1" : "0";
SetProperty(gsi::kGsiInstalledProp, is_installed);
+ if (android::gsi::IsGsiRunning()) {
+ std::string dsu_slot;
+ if (android::gsi::GetActiveDsu(&dsu_slot)) {
+ SetProperty(gsi::kDsuSlotProp, dsu_slot);
+ }
+ }
am.QueueBuiltinAction(SetupCgroupsAction, "SetupCgroups");
am.QueueBuiltinAction(SetKptrRestrictAction, "SetKptrRestrict");