am 85a9566f: am 76520752: Merge "rootfs: init.rc start logd parse error"

* commit '85a9566f7c1b9bcef150edc587a3e64b1196ffc8':
  rootfs: init.rc start logd parse error
This commit is contained in:
Mark Salyzyn 2015-04-23 22:45:50 +00:00 committed by Android Git Automerger
commit 44f1356e42

View file

@ -162,6 +162,7 @@ on property:sys.boot_from_charger_mode=1
# Load properties from /system/ + /factory after fs mount.
on load_all_props_action
load_all_props
start logd
start logd-reinit
# Indicate to fw loaders that the relevant mounts are up.
@ -445,6 +446,7 @@ on property:vold.decrypt=trigger_reset_main
on property:vold.decrypt=trigger_load_persist_props
load_persist_props
start logd
start logd-reinit
on property:vold.decrypt=trigger_post_fs_data
@ -490,7 +492,6 @@ service logd /system/bin/logd
socket logdw dgram 0222 logd logd
service logd-reinit /system/bin/logd --reinit
start logd
oneshot
disabled