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

Merge "Fix the order for boot scripts scanning" am: ccab04e5b5 am: 28d0dba1f5

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1393378

Change-Id: I740e1af6a5814d682930a7836006c7d55674194f
This commit is contained in:
Jooyung Han 2020-08-07 23:59:37 +00:00 • committed by Automerger Merge Worker
commit 9a4f58b8d5
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
init/init.cpp
View file

@ -310,14 +310,14 @@ static void LoadBootScripts(ActionManager& action_manager, ServiceList& service_
// late_import is available only in Q and earlier release. As we don't
// have system_ext in those versions, skip late_import for system_ext.
parser.ParseConfig("/system_ext/etc/init");
if (!parser.ParseConfig("/product/etc/init")) {
late_import_paths.emplace_back("/product/etc/init");
if (!parser.ParseConfig("/vendor/etc/init")) {
late_import_paths.emplace_back("/vendor/etc/init");
}
if (!parser.ParseConfig("/odm/etc/init")) {
late_import_paths.emplace_back("/odm/etc/init");
}
if (!parser.ParseConfig("/vendor/etc/init")) {
late_import_paths.emplace_back("/vendor/etc/init");
if (!parser.ParseConfig("/product/etc/init")) {
late_import_paths.emplace_back("/product/etc/init");
}
} else {
parser.ParseConfig(bootscript);