diff options
| author | Dima Zavin <dima@android.com> | 2011-12-16 14:23:22 -0800 |
|---|---|---|
| committer | Dima Zavin <dima@android.com> | 2012-01-05 15:02:00 -0800 |
| commit | 7634bf87cf6490e5544f040fb403eb164cf0ee5f (patch) | |
| tree | 08bf17c7b80f950d564b7120f90d9c5b4c9c5ef4 | |
| parent | 976b878a0a257676cde09556d3e08375b8d2f81a (diff) | |
| download | system_core-7634bf87cf6490e5544f040fb403eb164cf0ee5f.tar.gz system_core-7634bf87cf6490e5544f040fb403eb164cf0ee5f.tar.bz2 system_core-7634bf87cf6490e5544f040fb403eb164cf0ee5f.zip | |
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>
| -rwxr-xr-x | init/init.c | 2 | ||||
| -rw-r--r-- | rootdir/init.rc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/init/init.c b/init/init.c index 6aa9179a..41de63a6 100755 --- a/init/init.c +++ b/init/init.c @@ -706,8 +706,6 @@ int main(int argc, char **argv) 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); diff --git a/rootdir/init.rc b/rootdir/init.rc index 822ae025..8041b93a 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 |