first_stage_mount: Skip dm-verity setup if AVB is not enabled
Change-Id: Ia06e94e91cf5fdce14ce37eb85fdd95df1d059bc
diff --git a/init/first_stage_mount.cpp b/init/first_stage_mount.cpp
index 5d3a273..6e0895c 100644
--- a/init/first_stage_mount.cpp
+++ b/init/first_stage_mount.cpp
@@ -441,9 +441,14 @@
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);