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

Commit f7c2585f authored by Jooyung Han's avatar Jooyung Han
Browse files

Fix the order for boot scripts scanning 

To support "override" services, we need to scan partitions from least
speicific to most specific.

Bug: 163021585
Test: m
Change-Id: I26a6de4f7fb571c60038e803137a4b1c237792fd
parent 17ed9c4f

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);