Merge "Revert "Set ro.fstype.data when /data is mounted"" into main

This commit is contained in:
Priyanka Advani 2024-05-29 23:58:59 +00:00 committed by Gerrit Code Review
commit 58a38f4681

View file

@ -1656,19 +1656,6 @@ MountAllResult fs_mgr_mount_all(Fstab* fstab, int mount_mode) {
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);