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

Commit 704985af authored by Hung-ying Tyan's avatar Hung-ying Tyan Committed by android-build-merger
Browse files

Merge "init: add ro.boot.init_rc" am: 571cd23f am: fc8f2db4 

am: 70410e7c

Change-Id: I8697511f899a48ab65bef11eddc29af773324306
parents a7049759 70410e7c

init/init.cpp

+6 −1
Original line number Diff line number Diff line
@@ -835,7 +835,12 @@ int main(int argc, char** argv) { 
    parser.AddSectionParser("service",std::make_unique<ServiceParser>());

    parser.AddSectionParser("on", std::make_unique<ActionParser>());

    parser.AddSectionParser("import", std::make_unique<ImportParser>());

    std::string bootscript = property_get("ro.boot.init_rc");

    if (bootscript.empty()) {

        parser.ParseConfig("/init.rc");

    } else {

        parser.ParseConfig(bootscript);

    }



    ActionManager& am = ActionManager::GetInstance();