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

Merge "fs_mgr_avb: allow top-level vbmeta struct to be in 'boot' partition" am: 2e0f8a3b13

Browse source 
am: ec10a51d7d

Change-Id: I89d10accb3fc61cbe14627dad26d8a22d4e91543
This commit is contained in:
Bowgo Tsai 2017-03-31 03:52:01 +00:00 • committed by android-build-merger
commit 1c7f528f4e
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs_mgr/fs_mgr_avb.cpp
View file

@ -390,10 +390,12 @@ static bool get_hashtree_descriptor(const std::string& partition_name,
continue; continue;
} }
// Ensures that hashtree descriptor is either in /vbmeta or in // Ensures that hashtree descriptor is in /vbmeta or /boot or in
// the same partition for verity setup. // the same partition for verity setup.
std::string vbmeta_partition_name(verify_data.vbmeta_images[i].partition_name); std::string vbmeta_partition_name(verify_data.vbmeta_images[i].partition_name);
if (vbmeta_partition_name != "vbmeta" && vbmeta_partition_name != partition_name) { if (vbmeta_partition_name != "vbmeta" &&
vbmeta_partition_name != "boot" && // for legacy device to append top-level vbmeta
vbmeta_partition_name != partition_name) {
LWARNING << "Skip vbmeta image at " << verify_data.vbmeta_images[i].partition_name LWARNING << "Skip vbmeta image at " << verify_data.vbmeta_images[i].partition_name
<< " for partition: " << partition_name.c_str(); << " for partition: " << partition_name.c_str();
continue; continue;