summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/init.rc22
1 files 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