commit f6dd434ea0c15405c326a3df24a4152d355f34fc
author Mark Salyzyn <salyzyn@google.com> Thu Apr 23 23:16:39 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 23 23:16:39 2015 +0000
tree 80131524a1281b16c88df31650f3c4ca5ca45ecb
parent b53ddb0b7cbeab159ebcb95e18b7fd279d12c78e
parent 6f1703212412265c4d77119c7d7dfd91a65f0b04

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

* commit '44f1356e42a64fefb194b5c74b62402f4ec2881e':
  rootfs: init.rc start logd parse error

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 696c9b9..c8818f3 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -165,6 +165,7 @@
 # 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.
@@ -461,6 +462,7 @@
 
 on property:vold.decrypt=trigger_load_persist_props
     load_persist_props
+    start logd
     start logd-reinit
 
 on property:vold.decrypt=trigger_post_fs_data
@@ -506,7 +508,6 @@
     socket logdw dgram 0222 logd logd
 
 service logd-reinit /system/bin/logd --reinit
-    start logd
     oneshot
     disabled