Merge "Revert "Set ro.fstype.data when /data is mounted"" into main am: 58a38f4681
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3107408
Change-Id: I56adc205d715ce78206bb16a5cad11d4c721470f
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 7f41cea..835a3e7 100644
--- a/fs_mgr/fs_mgr.cpp
+++ b/fs_mgr/fs_mgr.cpp
@@ -1656,19 +1656,6 @@
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);