summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Lawrence <paullawrence@google.com>2015-07-06 22:22:20 +0200
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-06 22:22:20 +0200
commit3cc5148007a7ad2ff0b868ae89c7835286dd148c (patch)
treef1662014f6d158783b3e6d9cf2cceec925781b0c
parentam 501282a4: am b4b41daa: am 0ddfa329: Allow mounting squashfs partitions (diff)
parentMerge "Change init sequence to support file level encryption" into mnc-dev (diff)
downloadandroid_bootable_recovery-3cc5148007a7ad2ff0b868ae89c7835286dd148c.tar
android_bootable_recovery-3cc5148007a7ad2ff0b868ae89c7835286dd148c.tar.gz
android_bootable_recovery-3cc5148007a7ad2ff0b868ae89c7835286dd148c.tar.bz2
android_bootable_recovery-3cc5148007a7ad2ff0b868ae89c7835286dd148c.tar.lz
android_bootable_recovery-3cc5148007a7ad2ff0b868ae89c7835286dd148c.tar.xz
android_bootable_recovery-3cc5148007a7ad2ff0b868ae89c7835286dd148c.tar.zst
android_bootable_recovery-3cc5148007a7ad2ff0b868ae89c7835286dd148c.zip
Diffstat (limited to '')
-rw-r--r--etc/init.rc6
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/init.rc b/etc/init.rc
index 0a4c6e9df..dc1865986 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_all_props_action
- load_all_props
+on load_system_props_action
+ load_system_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_all_props_action
+ trigger load_system_props_action
# Remove a file to wake up anything waiting for firmware
trigger firmware_mounts_complete