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

Commit 88bba959 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "init: set SetKptrRestrict before early-init"

parents 34f25373 33783fc2

init/init.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -764,6 +764,7 @@ int SecondStageMain(int argc, char** argv) { 




    am.QueueBuiltinAction(SetupCgroupsAction, "SetupCgroups");

    am.QueueBuiltinAction(SetupCgroupsAction, "SetupCgroups");





    am.QueueBuiltinAction(SetKptrRestrictAction, "SetKptrRestrict");

    am.QueueEventTrigger("early-init");

    am.QueueEventTrigger("early-init");





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

    // Queue an action that waits for coldboot done so we know ueventd has set up all of /dev...
@@ -771,7 +772,6 @@ int SecondStageMain(int argc, char** argv) { 
    // ... so that we can start queuing up actions that require stuff from /dev.

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

    am.QueueBuiltinAction(MixHwrngIntoLinuxRngAction, "MixHwrngIntoLinuxRng");

    am.QueueBuiltinAction(MixHwrngIntoLinuxRngAction, "MixHwrngIntoLinuxRng");

    am.QueueBuiltinAction(SetMmapRndBitsAction, "SetMmapRndBits");

    am.QueueBuiltinAction(SetMmapRndBitsAction, "SetMmapRndBits");

    am.QueueBuiltinAction(SetKptrRestrictAction, "SetKptrRestrict");

    Keychords keychords;

    Keychords keychords;

    am.QueueBuiltinAction(

    am.QueueBuiltinAction(

            [&epoll, &keychords](const BuiltinArguments& args) -> Result<void> {

            [&epoll, &keychords](const BuiltinArguments& args) -> Result<void> {