diff options
| author | Justin DeMartino <jjdemartino@google.com> | 2020-10-14 19:39:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-10-14 19:39:53 +0000 |
| commit | 0d11af03e43f110b0bb160f7e20436d0043e3038 (patch) | |
| tree | 48f8bcca856276ec73a86dd3fb26143d3ca64578 /init/init.cpp | |
| parent | 075666ebd0dee8d0c4a2efa54f7c324a3f67ee2a (diff) | |
| parent | a6c01e4e98d2b343dcecfc99611e2e6250c730db (diff) | |
Merge changes from topic "SP1A.200921.001" into s-keystone-qcom-dev
* changes:
fs_mgr: adb-remount-test.sh: filter out more administrivia mounts.
Merge SP1A.200921.001 Change-Id: I90b97c4e9fb10b1f45e74def404823eed5b1aaa8
Diffstat (limited to 'init/init.cpp')
| -rw-r--r-- | init/init.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/init/init.cpp b/init/init.cpp index 08898d1e4..73bf95f04 100644 --- a/init/init.cpp +++ b/init/init.cpp @@ -325,14 +325,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); |