commit 4ec72cc25fe889818977ea00d2e97c17a04818a5
author Jaekyun Seok <jaekyun@google.com> Wed Feb 22 20:37:57 2017 +0900
committer Jaekyun Seok <jaekyun@google.com> Sat Feb 25 08:06:12 2017 +0900
tree c8c3dd7612a57c6cd19ac78955af0efd4957034b
parent dbb40b64e9832c6bb808f73f384902aa356f0756

Treblize init.rc location

Treblization requires to locate partner-specific modules in its own
partition. So their own init.rc file could be located in /odm or
/vendor.
This CL is to support those locations for the init.rc.
Additionally thic CL modified import parser to support importing a
relative path.

Test: building succeeded and tested on sailfish with enabling early
mount.
Bug: 35269867

Change-Id: I1bce924a32c8a2b53fb5d981d35d758cf9ddd9a6

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index 3cb1276..9b14467 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -992,8 +992,16 @@
     std::string bootscript = property_get("ro.boot.init_rc");
     if (bootscript.empty()) {
         parser.ParseConfig("/init.rc");
+        parser.set_is_system_etc_init_loaded(
+                parser.ParseConfig("/system/etc/init"));
+        parser.set_is_vendor_etc_init_loaded(
+                parser.ParseConfig("/vendor/etc/init"));
+        parser.set_is_odm_etc_init_loaded(parser.ParseConfig("/odm/etc/init"));
     } else {
         parser.ParseConfig(bootscript);
+        parser.set_is_system_etc_init_loaded(true);
+        parser.set_is_vendor_etc_init_loaded(true);
+        parser.set_is_odm_etc_init_loaded(true);
     }
 
     ActionManager& am = ActionManager::GetInstance();