ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Treehugger Robot 2017-04-19 16:35:22 +00:00 • committed by Gerrit Code Review
commit 798ac73dcf
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
rootdir/init.rc
View file

@ -245,10 +245,6 @@ on property:sys.boot_from_charger_mode=1
class_stop charger class_stop charger
trigger late-init trigger late-init
# Load properties from /system/ + /factory after fs mount.
on load_system_props_action
load_system_props
on load_persist_props_action on load_persist_props_action
load_persist_props load_persist_props
start logd start logd
@ -269,11 +265,6 @@ on late-init
trigger fs trigger fs
trigger post-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 # Mount fstab in init.{$device}.rc by mount_all with '--late' parameter
# to only mount entries with 'latemount'. This is needed if '--early' is # to only mount entries with 'latemount'. This is needed if '--early' is
# specified in the previous mount_all command on the fs stage. # specified in the previous mount_all command on the fs stage.
@ -298,6 +289,13 @@ on late-init
trigger boot trigger boot
on post-fs 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 logd
start hwservicemanager start hwservicemanager