commit | 00f61d8f4d59ea7d5f4d4f18759e7b143187fceb | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed May 10 02:22:40 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed May 10 02:22:41 2017 +0000 |
tree | e324018d0ed9cd5ae0d77f0a1ded449261de237f | |
parent | c48bdc4336bd250cae5b2f86ba586dfa02d75948 [diff] | |
parent | 9da9fde2c182bd4815ce76c4bc3a2022ef9b12c7 [diff] |
Merge "fs_mgr_verity: fix androidboot.veritymode=enforcing doesn't work" into oc-dev
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;