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

am: 18e92c342a

Change-Id: I7c81797ad4684b6e23350694b84525c12d5cf958
This commit is contained in:
Bowgo Tsai 2017-05-08 15:41:16 +00:00 committed by android-build-merger
commit edba521fed

View file

@ -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;