From 3510359a3c382269e1b58bd5ce8d147e5f1c06e7 Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Tue, 18 Apr 2017 08:13:06 -0700 Subject: [PATCH] init.rc: move load_system_props to beginning of 'on fs' ro.logd.kernel, ro.config.low_ram, ro.logd.timestamp and ro.debuggable need to be retrieved prior to logd start in order for the service to behave in a configured manner. Other essential services are also dependent on these system properties as well, so it just makes sense to pick them all up first in 'on fs'. Test: smoke test Bug: 37425809 Change-Id: I33ad185f397ee527ed3c84cc2bcb40ff8ca785b5 --- rootdir/init.rc | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/rootdir/init.rc b/rootdir/init.rc index 56e736eb2..a94a71764 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -245,10 +245,6 @@ on property:sys.boot_from_charger_mode=1 class_stop charger trigger late-init -# Load properties from /system/ + /factory after fs mount. -on load_system_props_action - load_system_props - on load_persist_props_action load_persist_props start logd @@ -269,11 +265,6 @@ on late-init trigger fs trigger post-fs - # Load properties from /system/ + /factory after fs mount. Place - # this in another action so that the load will be scheduled after the prior - # issued fs triggers have completed. - trigger load_system_props_action - # Mount fstab in init.{$device}.rc by mount_all with '--late' parameter # to only mount entries with 'latemount'. This is needed if '--early' is # specified in the previous mount_all command on the fs stage. @@ -298,6 +289,13 @@ on late-init trigger boot on post-fs + # Load properties from + # /system/build.prop, + # /odm/build.prop, + # /vendor/build.prop and + # /factory/factory.prop + load_system_props + # start essential services start logd start hwservicemanager