diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-03-21 16:57:22 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2014-03-21 16:57:22 -0700 |
| commit | bdef5499d4eb0c4f5e6853471373acd610798c7c (patch) | |
| tree | a39ad7cc08bb5d753b1b9ce4b1d14e7ce2dbd7e1 /rootdir | |
| parent | abf0853702e8604eb2063c56ada27232d7a3e67d (diff) | |
| parent | f8f0531bb69a90e87f1bafa875e665e3935610b1 (diff) | |
| download | system_core-bdef5499d4eb0c4f5e6853471373acd610798c7c.zip system_core-bdef5499d4eb0c4f5e6853471373acd610798c7c.tar.gz system_core-bdef5499d4eb0c4f5e6853471373acd610798c7c.tar.bz2 | |
resolved conflicts for merge of f8f0531b to klp-modular-dev-plus-aosp
Change-Id: I87228aa0dbd0b909437c85812f2404ca8be39f38
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/init.rc | 18 |
1 files changed, 7 insertions, 11 deletions
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 @@ service ueventd /sbin/ueventd 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 @@ service adbd /sbin/adbd --root_seclabel=u:r:su:s0 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 |