commit 68b9d5f07a443b44d81e09f65a45fea8c8f4984b
author Mark Salyzyn <salyzyn@google.com> Sat Mar 22 00:06:57 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Mar 22 00:06:57 2014 +0000
tree f605d954e68fe161eeeaf643bd52169e34f8ce2a
parent 8096a0dd4c0f6d17e51726a69050c49a75cf098a
parent bdef5499d4eb0c4f5e6853471373acd610798c7c

am bdef5499: resolved conflicts for merge of f8f0531b to klp-modular-dev-plus-aosp

* commit 'bdef5499d4eb0c4f5e6853471373acd610798c7c':
  logd: core requirement

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 76b7ce7..4471dc9 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -438,6 +438,13 @@
     critical
     seclabel u:r:ueventd:s0
 
+service logd /system/bin/logd
+    class core
+    socket logd stream 0666 logd logd
+    socket logdr seqpacket 0666 logd logd
+    socket logdw dgram 0222 logd logd
+    seclabel u:r:logd:s0
+
 service healthd /sbin/healthd
     class core
     critical
@@ -470,17 +477,6 @@
 on property:ro.kernel.qemu=1
     start adbd
 
-service lmkd /system/bin/lmkd
-    class core
-    critical
-    socket lmkd seqpacket 0660 system system
-
-service logd /system/bin/logd
-    class main
-    socket logd stream 0666 logd logd
-    socket logdr seqpacket 0666 logd logd
-    socket logdw dgram 0222 logd logd
-
 service servicemanager /system/bin/servicemanager
     class core
     user system