| commit | 7a2c31ef92aefe20304dfdd0520fb1410fdd4edb | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Mar 02 20:15:33 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 02 20:15:33 2021 +0000 |
| tree | e91bb568d22146b846116414f60d8b80b306ca8c | |
| parent | 48c48867fc7e5b80f6259ed3525f14d0e2550a5a [diff] | |
| parent | 937611f843f20a5ea16a8f081f409edce04bd81f [diff] |
Merge "Search fstab also from /first_stage_ramdisk" am: 937611f843 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1611758 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifc4e34d34eceb545d15e1726bfb40f6ef5699e6d
diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp index 8ac3361..785a8e0 100644 --- a/fs_mgr/fs_mgr_fstab.cpp +++ b/fs_mgr/fs_mgr_fstab.cpp
@@ -412,7 +412,8 @@ if (!fs_mgr_get_boot_config(prop, &suffix)) continue; - for (const char* prefix : {"/odm/etc/fstab.", "/vendor/etc/fstab.", "/fstab."}) { + for (const char* prefix : + {"/odm/etc/fstab.", "/vendor/etc/fstab.", "/fstab.", "/first_stage_ramdisk/fstab."}) { std::string fstab_path = prefix + suffix; if (access(fstab_path.c_str(), F_OK) == 0) { return fstab_path;