commit 9cc9e52a04e534a3b0cc59fb353773cc6b785a70
author Hung-ying Tyan <tyanh@google.com> Tue Jan 24 04:03:54 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 24 04:03:54 2017 +0000
tree 3376a0e7b031596fa63255b850d356a997a8b164
parent c5aa85a17391a14b1b690680d19c80ce878948f8
parent 374b22ec006319476cbc7010cbc0599b89b93b3b

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

Change-Id: I9ab39983a551e9f13a6d163a9f0fa2efd904db0f

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index ddc707f..1ce3c35 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -835,7 +835,12 @@
     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();