summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Lawrence <paullawrence@google.com>2015-07-07 22:36:14 +0200
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-07 22:36:14 +0200
commitb32e439d04ba408a34dcc7b96bfa9a395fed1e34 (patch)
tree097fa88bcdb10c041db052a339c97ecfc9e6d063
parentam e93fa6b7: am 4e6507f3: am 2490dbc9: Merge "Allow mounting squashfs partitions" (diff)
parentam 10cf0942: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev (diff)
downloadandroid_bootable_recovery-b32e439d04ba408a34dcc7b96bfa9a395fed1e34.tar
android_bootable_recovery-b32e439d04ba408a34dcc7b96bfa9a395fed1e34.tar.gz
android_bootable_recovery-b32e439d04ba408a34dcc7b96bfa9a395fed1e34.tar.bz2
android_bootable_recovery-b32e439d04ba408a34dcc7b96bfa9a395fed1e34.tar.lz
android_bootable_recovery-b32e439d04ba408a34dcc7b96bfa9a395fed1e34.tar.xz
android_bootable_recovery-b32e439d04ba408a34dcc7b96bfa9a395fed1e34.tar.zst
android_bootable_recovery-b32e439d04ba408a34dcc7b96bfa9a395fed1e34.zip
-rw-r--r--etc/init.rc6
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/init.rc b/etc/init.rc
index dc1865986..0a4c6e9df 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -46,8 +46,8 @@ on boot
class_start default
# Load properties from /system/ + /factory after fs mount.
-on load_system_props_action
- load_system_props
+on load_all_props_action
+ load_all_props
on firmware_mounts_complete
rm /dev/.booting
@@ -62,7 +62,7 @@ on late-init
# 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
+ trigger load_all_props_action
# Remove a file to wake up anything waiting for firmware
trigger firmware_mounts_complete