From 4251a9bcff9dfd4d857d92c67e46c3a464675fe0 Mon Sep 17 00:00:00 2001 From: Matt Mower Date: Fri, 13 Nov 2015 14:01:49 -0600 Subject: init: Add new props triggers Both Omni and CM split props loading into load_system_props_action and load_persist_props_actions in Android 6.0 instead of all_props action. Add these triggers. Unrecognized triggers do not cause failures in init for versions of Android which do not have these. Change-Id: I9682690ff7d378dc0d5e1598754f7a29600c1c2d --- etc/init.rc | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/etc/init.rc b/etc/init.rc index f0af6be78..e6d8aec74 100644 --- a/etc/init.rc +++ b/etc/init.rc @@ -51,12 +51,20 @@ on boot class_start default -# Load properties from /system/ + /factory after fs mount. +# Load properties, pre-Android 6.0 on load_all_props_action load_all_props +# Load properties, Android 6.0+ +on load_system_props_action + load_system_props + +# Load properties, Android 6.0+, vendor init lives here +on load_persist_props_action + load_persist_props + on firmware_mounts_complete - rm /dev/.booting + rm /dev/.booting # Mount filesystems and start core system services. on late-init @@ -65,11 +73,15 @@ on late-init trigger post-fs trigger post-fs-data - # 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. + # Load properties, pre-Android 6.0 trigger load_all_props_action + # Load properties, Android 6.0+ + trigger load_system_props_action + + # Load properties, Android 6.0+, vendor init lives here + trigger load_persist_props_action + # Remove a file to wake up anything waiting for firmware trigger firmware_mounts_complete -- cgit v1.2.3