commit 1d52d946926be5af1ab582b13db9aabe861f7bed
author Bowgo Tsai <bowgotsai@google.com> Mon May 08 15:37:45 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 08 15:37:45 2017 +0000
tree 389d275d82f21304a7639ea3e6953d98455eb11e
parent 0d89a3f7d9ecedb0137d29554f89ea1548edeea8
parent 1d425da0aec8c0efa3bfcf4a871263028ab23d83

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

Change-Id: Id86ee7f84251e4fd4884dae7fab5677bed2c0501

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;