ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Treehugger Robot 2024-05-30 21:25:26 +00:00 • committed by Gerrit Code Review
commit 276eabe757
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
fs_mgr/fs_mgr.cpp
View file

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