summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Lawrence <paullawrence@google.com>2015-07-07 19:28:59 +0200
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-07 19:29:02 +0200
commit10cf0942a7f4b2bfd539416e4767aaaf866a6527 (patch)
treedddca694a117bb07276073195683a6f4653f910a
parentMerge "Change init sequence to support file level encryption" into mnc-dev (diff)
parentRevert "Change init sequence to support file level encryption" (diff)
downloadandroid_bootable_recovery-10cf0942a7f4b2bfd539416e4767aaaf866a6527.tar
android_bootable_recovery-10cf0942a7f4b2bfd539416e4767aaaf866a6527.tar.gz
android_bootable_recovery-10cf0942a7f4b2bfd539416e4767aaaf866a6527.tar.bz2
android_bootable_recovery-10cf0942a7f4b2bfd539416e4767aaaf866a6527.tar.lz
android_bootable_recovery-10cf0942a7f4b2bfd539416e4767aaaf866a6527.tar.xz
android_bootable_recovery-10cf0942a7f4b2bfd539416e4767aaaf866a6527.tar.zst
android_bootable_recovery-10cf0942a7f4b2bfd539416e4767aaaf866a6527.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 427727768..6c07c6027 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -47,8 +47,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
@@ -63,7 +63,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