| commit | 5f68b422bd26a2f017bd72b2796967952e07b30d | [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 | 058b2ea8c52ed8ce33442eda3a39e49ecd11e6dd [diff] | |
| parent | 87a5b1f99295e130de7fc2b0463e0c30cc779c07 [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;