fs_mgr: autodetect filesystem type
* Multiple fstab lines (supported in android) cause recovery to fail
to mount partitions if the fs type is not the same as the first
fstab entry. So when we attempt to find an fstab entry, check it
against blkid's determination of what filesystem type it is.
* If blkid fails, or if no entry matches the detected fs type,
return the first found.
[aleasto: revamped for Q]
Change-Id: I7b720b534185fc7cb3860833aa49f748e02e3f6c
diff --git a/fs_mgr/Android.bp b/fs_mgr/Android.bp
index dfbcb47..e862c9b 100644
--- a/fs_mgr/Android.bp
+++ b/fs_mgr/Android.bp
@@ -74,7 +74,6 @@
whole_static_libs: [
"liblogwrap",
"libdm",
- "libext2_uuid",
"libfscrypt",
"libfstab",
],
@@ -150,6 +149,10 @@
"fs_mgr_boot_config.cpp",
"fs_mgr_slotselect.cpp",
],
+ whole_static_libs: [
+ "libext2_blkid",
+ "libext2_uuid",
+ ],
target: {
darwin: {
enabled: false,
diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp
index 2d59579..1a3e2c8 100644
--- a/fs_mgr/fs_mgr_fstab.cpp
+++ b/fs_mgr/fs_mgr_fstab.cpp
@@ -33,6 +33,7 @@
#include <android-base/properties.h>
#include <android-base/stringprintf.h>
#include <android-base/strings.h>
+#include <blkid/blkid.h>
#include <libgsi/libgsi.h>
#include "fs_mgr_priv.h"
@@ -822,6 +823,28 @@
return entries;
}
+FstabEntry* GetEntryForMountPointTryDetectFs(Fstab* fstab, const std::string& path) {
+ if (fstab == nullptr) {
+ return nullptr;
+ }
+ FstabEntry* found = GetEntryForMountPoint(fstab, path);
+ if (found == nullptr) {
+ return nullptr;
+ }
+
+ if (char* detected_fs_type = blkid_get_tag_value(nullptr, "TYPE", found->blk_device.c_str())) {
+ for (auto& entry : *fstab) {
+ if (entry.mount_point == path && entry.fs_type == detected_fs_type) {
+ found = &entry;
+ break;
+ }
+ }
+ free(detected_fs_type);
+ }
+
+ return found;
+}
+
std::set<std::string> GetBootDevices() {
// First check the kernel commandline, then try the device tree otherwise
std::string dt_file_name = get_android_dt_dir() + "/boot_devices";
diff --git a/fs_mgr/fs_mgr_roots.cpp b/fs_mgr/fs_mgr_roots.cpp
index 89bf3d3..a54cbb1 100644
--- a/fs_mgr/fs_mgr_roots.cpp
+++ b/fs_mgr/fs_mgr_roots.cpp
@@ -37,7 +37,7 @@
if (path.empty()) return nullptr;
std::string str(path);
while (true) {
- auto entry = GetEntryForMountPoint(fstab, str);
+ auto entry = GetEntryForMountPointTryDetectFs(fstab, str);
if (entry != nullptr) return entry;
if (str == "/") break;
auto slash = str.find_last_of('/');
diff --git a/fs_mgr/include_fstab/fstab/fstab.h b/fs_mgr/include_fstab/fstab/fstab.h
index 736b904..5647ff0 100644
--- a/fs_mgr/include_fstab/fstab/fstab.h
+++ b/fs_mgr/include_fstab/fstab/fstab.h
@@ -102,9 +102,12 @@
bool SkipMountingPartitions(Fstab* fstab);
FstabEntry* GetEntryForMountPoint(Fstab* fstab, const std::string& path);
+
// The Fstab can contain multiple entries for the same mount point with different configurations.
std::vector<FstabEntry*> GetEntriesForMountPoint(Fstab* fstab, const std::string& path);
+FstabEntry* GetEntryForMountPointTryDetectFs(Fstab* fstab, const std::string& path);
+
// This method builds DSU fstab entries and transfer the fstab.
//
// fstab points to the unmodified fstab.