commit d7abdb21b3201de10bde3347e6de443f44f362ca
author Dima Zavin <dima@android.com> Wed Jan 11 07:09:56 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 11 07:09:56 2012 -0800
tree 05adc743cd8b6b20362f8a556a9a0ffc23ad78f9
parent 079d56d0bdcbc04672e83557d06d716eaef44d4f
parent 3e7b7739e3d4d7aaaa363645501036dafcc30ed3

am 3e7b7739: init: import the hardware specific init file in init.rc

* commit '3e7b7739e3d4d7aaaa363645501036dafcc30ed3':
  init: import the hardware specific init file in init.rc

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