Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d57fb83 authored by David Anderson's avatar David Anderson
Browse files

init: Fix ordering of second-stage snapuserd transition. 

Running snapuserd before early-init means ueventd is missing, which
means we can't use WaitForFile() when dm-user misc devices are created.
Fix this by starting the transition after early-init.

Bug: 173476209
Test: full OTA with VABC applies and boots
Change-Id: Ice594cceb44981ae38deb82289d313c14726c36b
parent 32f281d7

init/init.cpp

+1 −1
Original line number Diff line number Diff line
@@ -875,13 +875,13 @@ int SecondStageMain(int argc, char** argv) { 
    SetProperty(gsi::kGsiInstalledProp, is_installed);



    am.QueueBuiltinAction(SetupCgroupsAction, "SetupCgroups");

    am.QueueBuiltinAction(TransitionSnapuserdAction, "TransitionSnapuserd");

    am.QueueBuiltinAction(SetKptrRestrictAction, "SetKptrRestrict");

    am.QueueBuiltinAction(TestPerfEventSelinuxAction, "TestPerfEventSelinux");

    am.QueueEventTrigger("early-init");



    // Queue an action that waits for coldboot done so we know ueventd has set up all of /dev...

    am.QueueBuiltinAction(wait_for_coldboot_done_action, "wait_for_coldboot_done");

    am.QueueBuiltinAction(TransitionSnapuserdAction, "TransitionSnapuserd");

    // ... so that we can start queuing up actions that require stuff from /dev.

    am.QueueBuiltinAction(MixHwrngIntoLinuxRngAction, "MixHwrngIntoLinuxRng");

    am.QueueBuiltinAction(SetMmapRndBitsAction, "SetMmapRndBits");