commit 8e45d44c3e87166f044345792904fef9faa8defd
author Mark Salyzyn <salyzyn@google.com> Thu Apr 23 22:34:48 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 23 22:34:48 2015 +0000
tree adc2ae18ee985f03904caff24b7fe07073644cc2
parent 22522cb762173c18e9baffaae0c3ba2a05fdbbc3
parent 33fe64266276deedb3c0f49f0d23eff70af886f4

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

* commit '765207524fcbe261686c5d96bc42ea3dcc124f0a':
  rootfs: init.rc start logd parse error

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index a5ea60a..d3c562f 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -162,6 +162,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.
@@ -445,6 +446,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
@@ -490,7 +492,6 @@
     socket logdw dgram 0222 logd logd
 
 service logd-reinit /system/bin/logd --reinit
-    start logd
     oneshot
     disabled