Merge "fs_mgr: support reading fstab based on ro.boot.hardware.platform" am: 3d879b10d8
am: 45aa5ed89a
Change-Id: I71f449c2ae0a24a736f460cb64e501e09485bf30
diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp
index 92c6ee8..2c18a6d 100644
--- a/fs_mgr/fs_mgr_fstab.cpp
+++ b/fs_mgr/fs_mgr_fstab.cpp
@@ -700,25 +700,44 @@
}
/*
- * tries to load default fstab.<hardware> file from /odm/etc, /vendor/etc
- * or /. loads the first one found and also combines fstab entries passed
- * in from device tree.
+ * Identify path to fstab file. Lookup is based on pattern
+ * fstab.<hardware>, fstab.<hardware.platform> in folders
+ /odm/etc, vendor/etc, or /.
+ */
+static std::string get_fstab_path()
+{
+ for (const char* prop : {"hardware", "hardware.platform"}) {
+ std::string hw;
+
+ if (!fs_mgr_get_boot_config(prop, &hw)) continue;
+
+ for (const char* prefix : {"/odm/etc/fstab.", "/vendor/etc/fstab.", "/fstab."}) {
+ std::string fstab_path = prefix + hw;
+ if (access(fstab_path.c_str(), F_OK) == 0) {
+ return fstab_path;
+ }
+ }
+ }
+
+ return std::string();
+}
+
+/*
+ * loads the fstab file and combines with fstab entries passed in from device tree.
*/
struct fstab *fs_mgr_read_fstab_default()
{
- std::string hw;
std::string default_fstab;
// Use different fstab paths for normal boot and recovery boot, respectively
if (access("/sbin/recovery", F_OK) == 0) {
default_fstab = "/etc/recovery.fstab";
- } else if (fs_mgr_get_boot_config("hardware", &hw)) { // normal boot
- for (const char *prefix : {"/odm/etc/fstab.","/vendor/etc/fstab.", "/fstab."}) {
- default_fstab = prefix + hw;
- if (access(default_fstab.c_str(), F_OK) == 0) break;
- }
- } else {
- LWARNING << __FUNCTION__ << "(): failed to find device hardware name";
+ } else { // normal boot
+ default_fstab = get_fstab_path();
+ }
+
+ if (default_fstab.empty()) {
+ LWARNING << __FUNCTION__ << "(): failed to find device default fstab";
}
// combines fstab entries passed in from device tree with