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

Commit 4c5acc0f authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "Fix the order for boot scripts scanning" am: ccab04e5 am: 28d0dba1 am: 9a4f58b8 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1393378

Change-Id: I767f9ed803b0db6f2737dcb0cf123166a9fc110b
parents 81a8c659 9a4f58b8

init/init.cpp

+4 −4
Original line number Diff line number Diff line
@@ -310,14 +310,14 @@ static void LoadBootScripts(ActionManager& action_manager, ServiceList& service_ 
        // late_import is available only in Q and earlier release. As we don't

        // have system_ext in those versions, skip late_import for system_ext.

        parser.ParseConfig("/system_ext/etc/init");

        if (!parser.ParseConfig("/product/etc/init")) {

            late_import_paths.emplace_back("/product/etc/init");

        if (!parser.ParseConfig("/vendor/etc/init")) {

            late_import_paths.emplace_back("/vendor/etc/init");

        }

        if (!parser.ParseConfig("/odm/etc/init")) {

            late_import_paths.emplace_back("/odm/etc/init");

        }

        if (!parser.ParseConfig("/vendor/etc/init")) {

            late_import_paths.emplace_back("/vendor/etc/init");

        if (!parser.ParseConfig("/product/etc/init")) {

            late_import_paths.emplace_back("/product/etc/init");

        }

    } else {

        parser.ParseConfig(bootscript);