commit 78c65e52a8409ddb7774fc4ad814d6f68ac83f7f
author Kelvin Zhang <zhangkelvin@google.com> Mon May 20 18:05:40 2024 -0700
committer Kelvin Zhang <zhangkelvin@google.com> Wed May 22 10:42:02 2024 -0700
tree 54a2d19fd46996c1b6ed102bca2cc664f112e1a2
parent e77a69d0b16a56e7823174b6e80ad8afc8f833f5

Set ro.fstype.data when /data is mounted

Test: th
Bug: 341216848
Change-Id: I8adf12661eeb790bf0beb80409a678d53c2baea5

fs_mgr/fs_mgr.cpp

diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp
index 835a3e7..7f41cea 100644
--- a/fs_mgr/fs_mgr.cpp
+++ b/fs_mgr/fs_mgr.cpp
@@ -1656,6 +1656,19 @@
             continue;
         }
     }
+    if (userdata_mounted) {
+        Fstab mounted_fstab;
+        if (!ReadFstabFromFile("/proc/mounts", &mounted_fstab)) {
+            LOG(ERROR) << "Could't load fstab from /proc/mounts , unable to set ro.fstype.data . "
+                          "init.rc actions depending on this prop would not run, boot might fail.";
+        } else {
+            for (const auto& entry : mounted_fstab) {
+                if (entry.mount_point == "/data") {
+                    android::base::SetProperty("ro.fstype.data", entry.fs_type);
+                }
+            }
+        }
+    }
 
     set_type_property(encryptable);