pa-fazil
/
android_system_core
mirror of https://github.com/fazilsheik96/android_system_core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

first_stage_mount: Skip dm-verity setup if AVB is not enabled 

Change-Id: Ia06e94e91cf5fdce14ce37eb85fdd95df1d059bc
This commit is contained in:
me-cafebabe 2022-10-04 12:41:16 +00:00 committed by Fazil Sheik
parent 28d0e308cc
commit f459c79610
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
init/first_stage_mount.cpp
View File

@ -429,9 +429,14 @@ bool FirstStageMount::MountPartition(const Fstab::iterator& begin, bool erase_sa
return false;
}
}
if (!SetUpDmVerity(&(*begin))) {
PLOG(ERROR) << "Failed to setup verity for '" << begin->mount_point << "'";
return false;
if (begin->fs_mgr_flags.avb) {
if (!SetUpDmVerity(&(*begin))) {
PLOG(ERROR) << "Failed to setup verity for '" << begin->mount_point << "'";
return false;
}
} else {
LOG(INFO) << "AVB is not enabled, skip verity setup for '" << begin->mount_point << "'";
}
bool mounted = (fs_mgr_do_mount_one(*begin) == 0);