aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Lawrence <paullawrence@google.com>2015-07-07 17:05:39 +0000
committerThe Android Automerger <android-build@google.com>2015-07-07 14:44:00 -0700
commitbabcffafa42986ac68b4ebec068ee5ee88578ccc (patch)
treedddca694a117bb07276073195683a6f4653f910a
parent239d57242c0009db5dabc334374dea92935b703a (diff)
downloadbootable_recovery-babcffafa42986ac68b4ebec068ee5ee88578ccc.zip
bootable_recovery-babcffafa42986ac68b4ebec068ee5ee88578ccc.tar.gz
bootable_recovery-babcffafa42986ac68b4ebec068ee5ee88578ccc.tar.bz2
Revert "Change init sequence to support file level encryption"
This reverts commit 98c1a3de23ae8b589c36e74939193c44d25cac65. Change-Id: I524060418de18f97c3865ebc4435f501015e92ee
-rw-r--r--etc/init.rc6
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/init.rc b/etc/init.rc
index 4277277..6c07c60 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