commit 3e7b7739e3d4d7aaaa363645501036dafcc30ed3
author Dima Zavin <dima@android.com> Fri Dec 16 14:23:22 2011 -0800
committer Jean-Baptiste Queru <jbq@google.com> Wed Jan 11 04:35:58 2012 -0800
tree 1e60045ebca12b40ed775c3bbab674c96e8a5d20
parent a6235eacf4b06b14b19125618d7aca570dbc02b0

init: import the hardware specific init file in init.rc

This removes the hardcoding of the file import in init and instead
allows the init.rc file to fully control what is loaded.

Change-Id: I933e5bbab57f1e8705a370d660f92c6508da94d2
Signed-off-by: Dima Zavin <dima@android.com>

init/init.c

diff --git a/init/init.c b/init/init.c
index 6aa9179..41de63a 100755
--- a/init/init.c
+++ b/init/init.c
@@ -706,8 +706,6 @@
 
     INFO("reading config file\n");
     init_parse_config_file("/init.rc");
-    snprintf(tmp, sizeof(tmp), "/init.%s.rc", hardware);
-    init_parse_config_file(tmp);
 
     action_for_each_trigger("early-init", action_add_queue_tail);
 

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 145f642..23155ca 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -1,3 +1,5 @@
+import /init.${ro.hardware}.rc
+
 on early-init
     # Set init and its forked children's oom_adj.
     write /proc/1/oom_adj -16