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 zlewchan
parent 9ee2afd3b5
commit 9cb248617d

View file

@ -441,9 +441,14 @@ bool FirstStageMountVBootV2::MountPartition(const Fstab::iterator& begin, bool e
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);