From 7634bf87cf6490e5544f040fb403eb164cf0ee5f Mon Sep 17 00:00:00 2001 From: Dima Zavin Date: Fri, 16 Dec 2011 14:23:22 -0800 Subject: [PATCH] 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 --- init/init.c | 2 -- rootdir/init.rc | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/init/init.c b/init/init.c index 6aa9179a9..41de63a64 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 822ae0254..8041b93a3 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