recovery: replacing fs_mgr_read_fstab() with new fs_mgr APIs
The fstab settings of early-mounted partitions (e.g., /vendor) will be in
kernel device tree. Switch to the new API to get the whole settings with
those in device tree:
fs_mgr_read_fstab_with_dt("/etc/recovery.fstab")
The original default /fstab.{ro.hardware} might be moved to
/vendor/etc/. or /odm/etc/. Use another new API to get the default fstab
instead of using the hard-coded /fstab.{ro.hardware}. This API also
includes the settings from device tree:
fs_mgr_read_fstab_default()
Bug: 35811655
Test: boot sailfish recovery
Change-Id: Iaa56ac7f7b4c4dfc7180c65f03e9a37b94f1de09
diff --git a/tests/common/component_test_util.h b/tests/common/component_test_util.h
index 4432297..3fee32d 100644
--- a/tests/common/component_test_util.h
+++ b/tests/common/component_test_util.h
@@ -24,21 +24,14 @@
// Check if the /misc entry exists in the fstab.
static bool parse_misc() {
- // The fstab path is "/fstab.${ro.hardware}".
- std::string ro_hardware = android::base::GetProperty("ro.hardware", "");
- if (ro_hardware.empty()) {
- GTEST_LOG_(INFO) << "Failed to get ro.hardware.";
+ std::unique_ptr<fstab, decltype(&fs_mgr_free_fstab)> fstab(fs_mgr_read_fstab_default(),
+ fs_mgr_free_fstab);
+ if (!fstab) {
+ GTEST_LOG_(INFO) << "Failed to read default fstab";
return false;
}
- std::string fstab_path = "/fstab." + ro_hardware;
- fstab* fstab = fs_mgr_read_fstab(fstab_path.c_str());
- if (fstab == nullptr) {
- GTEST_LOG_(INFO) << "Failed to read " << fstab_path;
- return false;
- }
-
- fstab_rec* record = fs_mgr_get_entry_for_mount_point(fstab, "/misc");
+ fstab_rec* record = fs_mgr_get_entry_for_mount_point(fstab.get(), "/misc");
if (record == nullptr) {
GTEST_LOG_(INFO) << "Failed to find /misc in fstab.";
return false;