summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2017-05-08 15:28:11 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-05-08 15:28:13 +0000
commit6019991c6ee34179295578df949b81b76aaefcd2 (patch)
tree69afa439f4c415d8c8b76b2d9272128eb59c6c31
parent1445c4b9321b288710ca9cbe0b14473dcb4ab8db (diff)
parent77cbfd6341a7a500fdb8e2f3cc4a4f721254f10e (diff)
downloadsystem_core-6019991c6ee34179295578df949b81b76aaefcd2.tar.gz
system_core-6019991c6ee34179295578df949b81b76aaefcd2.tar.bz2
system_core-6019991c6ee34179295578df949b81b76aaefcd2.zip
Merge "fs_mgr_verity: fix androidboot.veritymode=enforcing doesn't work"
-rw-r--r--fs_mgr/fs_mgr_verity.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs_mgr/fs_mgr_verity.cpp b/fs_mgr/fs_mgr_verity.cpp
index 0bf173bd8..5fa10bc6e 100644
--- a/fs_mgr/fs_mgr_verity.cpp
+++ b/fs_mgr/fs_mgr_verity.cpp
@@ -663,7 +663,7 @@ int load_verity_state(struct fstab_rec* fstab, int* mode) {
/* 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;