Merge "Set ro.fstype.data when /data is mounted" into main am: ac7923211e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3095293
Change-Id: I416213952c9c7dcf64e2b04504696b83211ab10a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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);