[automerger skipped] Merge "Merge "libsnapshot: Use SnapshotManager to delete devices." into android12L-tests-dev am: 11caad9d6c" into android13-tests-dev am: 0412ff9c1e am: 8c14f41847 am: 7b6b9809c9 am: a0caaae440 -s ours am: 34d2ae6aa5 -s ours am: 29fcec2c1f -s ours
am skip reason: Merged-In Ibcaa8406e8b1e8758b99a8e9b58c58d68ed57685 with SHA-1 c786b6d332 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2604246
Change-Id: Ice3e2e51875a739f9e018e6c37628fc387f71af9
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");