fs_mgr: support reading fstab file from /odm or /vendor partition
fstab contains device- and soc- specific content that should reside in
/odm or /vendor partition. This change searches the fstab.${ro.hardware}
file from /odm/etc, /vendor/etc and /, then use the first one found.
Bug: 35811655
Test: boot sailfish
Change-Id: I82f89b41a849faedb64072a7cfc52d7424e1aaa1
diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp
index b1ca0a2..2e54d69 100644
--- a/fs_mgr/fs_mgr_fstab.cpp
+++ b/fs_mgr/fs_mgr_fstab.cpp
@@ -636,8 +636,10 @@
return in_place_merge(fstab_dt, fstab);
}
-/* combines fstab entries passed in from device tree with
- * the ones found in /fstab.<hardware>
+/*
+ * 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.
*/
struct fstab *fs_mgr_read_fstab_default()
{
@@ -645,7 +647,10 @@
std::string default_fstab;
if (fs_mgr_get_boot_config("hardware", &hw)) {
- default_fstab = FSTAB_PREFIX + hw;
+ 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";
}
diff --git a/fs_mgr/fs_mgr_priv.h b/fs_mgr/fs_mgr_priv.h
index 4e2ac8b..377d2ec 100644
--- a/fs_mgr/fs_mgr_priv.h
+++ b/fs_mgr/fs_mgr_priv.h
@@ -41,8 +41,6 @@
#define PWARNING PLOG(WARNING) << FS_MGR_TAG
#define PERROR PLOG(ERROR) << FS_MGR_TAG
-const std::string FSTAB_PREFIX("/fstab.");
-
__BEGIN_DECLS
#define CRYPTO_TMPFS_OPTIONS "size=256m,mode=0771,uid=1000,gid=1000"