summaryrefslogtreecommitdiffstats
path: root/rootdir
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2015-03-13 07:09:39 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-13 07:09:39 +0000
commit7ad506839a4ea39bb47f203cd1dcd21b9260b3a6 (patch)
tree6d940529008e06c27039712b37ca822bfd49f6bd /rootdir
parent959470f72226a03187c00bad3e18bd54e8c77671 (diff)
parent6025a2bc493534b3003ebd2ad7130366cf4f6723 (diff)
downloadsystem_core-7ad506839a4ea39bb47f203cd1dcd21b9260b3a6.zip
system_core-7ad506839a4ea39bb47f203cd1dcd21b9260b3a6.tar.gz
system_core-7ad506839a4ea39bb47f203cd1dcd21b9260b3a6.tar.bz2
am 6025a2bc: am bd518bce: Merge changes I3187aa34,Iadac58e6
* commit '6025a2bc493534b3003ebd2ad7130366cf4f6723': init.rc: logd --reinit on changes to persistent properties logd: add reinit command
Diffstat (limited to 'rootdir')
-rw-r--r--rootdir/init.rc6
1 files changed, 6 insertions, 0 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc
index e351e91..9748fed 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -168,6 +168,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-reinit
# Indicate to fw loaders that the relevant mounts are up.
on firmware_mounts_complete
@@ -434,6 +435,7 @@ on property:vold.decrypt=trigger_reset_main
on property:vold.decrypt=trigger_load_persist_props
load_persist_props
+ start logd-reinit
on property:vold.decrypt=trigger_post_fs_data
trigger post-fs-data
@@ -476,6 +478,10 @@ service logd /system/bin/logd
socket logdr seqpacket 0666 logd logd
socket logdw dgram 0222 logd logd
+service logd-reinit /system/bin/logd --reinit
+ oneshot
+ disabled
+
service healthd /sbin/healthd
class core
critical