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

Commit 798ac73d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "init.rc: move load_system_props to beginning of 'on fs'"

parents 8b318d0c 3510359a
Loading
Loading
Loading
Loading
+7 −9
Original line number Diff line number Diff line
@@ -245,10 +245,6 @@ on property:sys.boot_from_charger_mode=1
    class_stop charger
    trigger late-init

# Load properties from /system/ + /factory after fs mount.
on load_system_props_action
    load_system_props

on load_persist_props_action
    load_persist_props
    start logd
@@ -269,11 +265,6 @@ on late-init
    trigger fs
    trigger post-fs

    # Load properties from /system/ + /factory after fs mount. Place
    # this in another action so that the load will be scheduled after the prior
    # issued fs triggers have completed.
    trigger load_system_props_action

    # Mount fstab in init.{$device}.rc by mount_all with '--late' parameter
    # to only mount entries with 'latemount'. This is needed if '--early' is
    # specified in the previous mount_all command on the fs stage.
@@ -298,6 +289,13 @@ on late-init
    trigger boot

on post-fs
    # Load properties from
    #     /system/build.prop,
    #     /odm/build.prop,
    #     /vendor/build.prop and
    #     /factory/factory.prop
    load_system_props
    # start essential services
    start logd
    start hwservicemanager