diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2015-04-23 23:16:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-23 23:16:39 +0000 |
| commit | 7076796cab1ae275d9e9336f19e068abf28f946b (patch) | |
| tree | 80131524a1281b16c88df31650f3c4ca5ca45ecb /rootdir | |
| parent | 2b70a6501f35db890d3ff81254c0bba13e039a28 (diff) | |
| parent | 44f1356e42a64fefb194b5c74b62402f4ec2881e (diff) | |
| download | system_core-7076796cab1ae275d9e9336f19e068abf28f946b.zip system_core-7076796cab1ae275d9e9336f19e068abf28f946b.tar.gz system_core-7076796cab1ae275d9e9336f19e068abf28f946b.tar.bz2 | |
am 44f1356e: am 85a9566f: am 76520752: Merge "rootfs: init.rc start logd parse error"
* commit '44f1356e42a64fefb194b5c74b62402f4ec2881e':
rootfs: init.rc start logd parse error
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/init.rc | 3 |
1 files changed, 2 insertions, 1 deletions
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 @@ 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 start logd-reinit # Indicate to fw loaders that the relevant mounts are up. @@ -461,6 +462,7 @@ on property:vold.decrypt=trigger_reset_main 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 @@ service logd /system/bin/logd socket logdw dgram 0222 logd logd service logd-reinit /system/bin/logd --reinit - start logd oneshot disabled |