commit 26e5d8f1e2602f0a490098e88c93fbb39cdeec18
author Treehugger Robot <treehugger-gerrit@google.com> Fri Apr 23 03:35:01 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 23 03:35:01 2021 +0000
tree e594da137499085d8788199489418c6fcc120382
parent 23a50b3860f0d3cc5bbe0bbad3349c85dd829002
parent 9eb1296ea9c7badc6aad352238af7460227c317d

Merge "Add new dm-verity error handling mode"

fs_mgr/libdm/dm_target.cpp

diff --git a/fs_mgr/libdm/dm_target.cpp b/fs_mgr/libdm/dm_target.cpp
index ef46eb9..b0639e6 100644
--- a/fs_mgr/libdm/dm_target.cpp
+++ b/fs_mgr/libdm/dm_target.cpp
@@ -95,7 +95,9 @@
 }
 
 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;

fs_mgr/libfs_avb/avb_util.cpp

diff --git a/fs_mgr/libfs_avb/avb_util.cpp b/fs_mgr/libfs_avb/avb_util.cpp
index 2288674..31494c1 100644
--- a/fs_mgr/libfs_avb/avb_util.cpp
+++ b/fs_mgr/libfs_avb/avb_util.cpp
@@ -61,7 +61,9 @@
 
     // 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";