1 files changed, 10 insertions, 0 deletions

diff --git a/etc/init.rc b/etc/init.rc
index dc8b6e3f6..907436c71 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -10,6 +10,9 @@ on early-init
     # This should occur before anything else (e.g. ueventd) is started.
     setcon u:r:init:s0
 
+    # Set the security context of /postinstall if present.
+    restorecon /postinstall
+
     start ueventd
     start healthd
 
@@ -20,6 +23,7 @@ service set_permissive /sbin/permissive.sh
 on init
     export PATH /sbin:/system/bin
     export LD_LIBRARY_PATH .:/sbin
+
     export ANDROID_ROOT /system
     export ANDROID_DATA /data
     export EXTERNAL_STORAGE /sdcard
@@ -77,6 +81,11 @@ on late-init
     # Load properties, pre-Android 6.0
     trigger load_all_props_action
 
+    # 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
+
     # Load properties, Android 6.0+
     trigger load_system_props_action
 
@@ -101,6 +110,7 @@ service healthd /sbin/healthd -r
     seclabel u:r:healthd:s0
 
 service recovery /sbin/recovery
+    seclabel u:r:recovery:s0
 
 service adbd /sbin/adbd --root_seclabel=u:r:su:s0 --device_banner=recovery
     disabled