Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7076796c authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Android Git Automerger
Browse files

am 44f1356e: am 85a9566f: am 76520752: Merge "rootfs: init.rc start logd parse error"

* commit '44f1356e':
  rootfs: init.rc start logd parse error
parents 2b70a650 44f1356e
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -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