openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "init: add ro.boot.init_rc" 

am: 571cd23fa8

Change-Id: Ie945f49d9ce1fe849140d522b53f6346865d2f1e
This commit is contained in:
Hung-ying Tyan 2017-01-24 04:01:25 +00:00 committed by android-build-merger
parent 8077c96655 571cd23fa8
commit fc8f2db476
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
init/init.cpp
View File

@ -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>());
parser.ParseConfig("/init.rc");
std::string bootscript = property_get("ro.boot.init_rc");
if (bootscript.empty()) {
parser.ParseConfig("/init.rc");
} else {
parser.ParseConfig(bootscript);
}
ActionManager& am = ActionManager::GetInstance();