ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "init: add ro.boot.init_rc" am: 571cd23fa8 am: fc8f2db476

Browse source 
am: 70410e7c41

Change-Id: I8697511f899a48ab65bef11eddc29af773324306
This commit is contained in:
Hung-ying Tyan 2017-01-24 04:05:55 +00:00 • committed by android-build-merger
commit 704985af60
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();