[automerger skipped] Merge changes from topic "am-adb4dc995e83421e9148d1453567507c" into android13-tests-dev am: d42cd6887d -s ours am: f2dac32dcd -s ours am: 877b5d4e42 -s ours am: 0cd04f0997 -s ours am: a73bd28727 -s ours am: b64701c67b -s ours
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2604245
Change-Id: Ifa3b8ae09824be5478f231698b8a25807c147ef6
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");