openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Add new dm-verity error handling mode"

This commit is contained in:
Treehugger Robot 2021-04-23 03:35:01 +00:00 committed by Gerrit Code Review
parent 23a50b3860 9eb1296ea9
commit 26e5d8f1e2
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs_mgr/libdm/dm_target.cpp
View File

@ -95,7 +95,9 @@ void DmTargetVerity::UseFec(const std::string& device, uint32_t num_roots, uint3
}
void DmTargetVerity::SetVerityMode(const std::string& mode) {
if (mode != "restart_on_corruption" && mode != "ignore_corruption") {
if (mode != "panic_on_corruption" &&
mode != "restart_on_corruption" &&
mode != "ignore_corruption") {
LOG(ERROR) << "Unknown verity mode: " << mode;
valid_ = false;
return;

4
fs_mgr/libfs_avb/avb_util.cpp
View File

@ -61,7 +61,9 @@ bool ConstructVerityTable(const FsAvbHashtreeDescriptor& hashtree_desc,
// Converts veritymode to the format used in kernel.
std::string dm_verity_mode;
if (verity_mode == "enforcing") {
if (verity_mode == "panicking") {
dm_verity_mode = "panic_on_corruption";
} else if (verity_mode == "enforcing") {
dm_verity_mode = "restart_on_corruption";
} else if (verity_mode == "logging") {
dm_verity_mode = "ignore_corruption";