diff options
author | David Anderson <dvander@google.com> | 2019-04-02 14:08:44 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-04-02 14:08:44 -0700 |
commit | 5fa37b77d1a85f39e1542f4a0da75e03c88eac08 (patch) | |
tree | 430ebd1aae467de7e5eee4263e30c400ced548e6 | |
parent | 64ec642955db0825f3216a484aaaf2fd6fa9ea77 (diff) | |
parent | 9a53189ae51f7ca879c07cee04ee7c859612cf6f (diff) | |
download | recovery-5fa37b77d1a85f39e1542f4a0da75e03c88eac08.tar.gz |
Merge "Append -verity when looking for verity device-mapper names." am: bc2eab4315
am: 9a53189ae5
Change-Id: Ibc664119ec22f7dd1906f1afc44015829c6e3d2e
-rw-r--r-- | update_verifier/update_verifier.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/update_verifier/update_verifier.cpp b/update_verifier/update_verifier.cpp index 0cf536ce..d04c455d 100644 --- a/update_verifier/update_verifier.cpp +++ b/update_verifier/update_verifier.cpp @@ -115,6 +115,15 @@ std::map<std::string, std::string> UpdateVerifier::FindDmPartitions() { // AVB is using 'vroot' for the root block device but we're expecting 'system'. if (dm_block_name == "vroot") { dm_block_name = "system"; + } else if (android::base::EndsWith(dm_block_name, "-verity")) { + auto npos = dm_block_name.rfind("-verity"); + dm_block_name = dm_block_name.substr(0, npos); + } else if (!android::base::GetProperty("ro.boot.avb_version", "").empty()) { + // Verified Boot 1.0 doesn't add a -verity suffix. On AVB 2 devices, + // if DAP is enabled, then a -verity suffix must be used to + // differentiate between dm-linear and dm-verity devices. If we get + // here, we're AVB 2 and looking at a non-verity partition. + continue; } dm_block_devices.emplace(dm_block_name, DEV_PATH + std::string(namelist[n]->d_name)); |