commit 7f646bb07022ff543656d7b391e33246880defbf
author Bowgo Tsai <bowgotsai@google.com> Mon May 08 15:41:16 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 08 15:41:16 2017 +0000
tree a4bed34a543c1c990d24a2121bd4b8282e12261c
parent c805a99ea6b77234442f60faaf33eeefc3c50852
parent 1d52d946926be5af1ab582b13db9aabe861f7bed

Merge "fs_mgr_verity: fix androidboot.veritymode=enforcing doesn't work" am: 6019991c6e am: 4dd17998ed am: d6576491fe
am: 18e92c342a

Change-Id: I7c81797ad4684b6e23350694b84525c12d5cf958

fs_mgr/fs_mgr_verity.cpp

diff --git a/fs_mgr/fs_mgr_verity.cpp b/fs_mgr/fs_mgr_verity.cpp
index 0bf173b..5fa10bc 100644
--- a/fs_mgr/fs_mgr_verity.cpp
+++ b/fs_mgr/fs_mgr_verity.cpp
@@ -663,7 +663,7 @@
     /* use the kernel parameter if set */
     std::string veritymode;
     if (fs_mgr_get_boot_config("veritymode", &veritymode)) {
-        if (veritymode.compare("enforcing")) {
+        if (veritymode == "enforcing") {
             *mode = VERITY_MODE_DEFAULT;
         }
         return 0;