diff options
| author | Sami Tolvanen <samitolvanen@google.com> | 2015-12-10 15:43:02 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-10 15:43:02 -0800 |
| commit | 6401e61a6aadf68efc80394c6368637d94281983 (patch) | |
| tree | 8dd70af9408c112493506afbdb374fcdce77139d /init | |
| parent | 40e795d55d32227d0373caaee1355b4ed3fc3c30 (diff) | |
| parent | 42a86f8d1e918356e86d4eb3fb2444a8c42d25ff (diff) | |
| download | core-6401e61a6aadf68efc80394c6368637d94281983.tar.gz core-6401e61a6aadf68efc80394c6368637d94281983.tar.bz2 core-6401e61a6aadf68efc80394c6368637d94281983.zip | |
Merge "Set up dm-verity in EIO mode instead of logging mode" am: 0d1214c68e
am: 42a86f8d1e
* commit '42a86f8d1e918356e86d4eb3fb2444a8c42d25ff':
Set up dm-verity in EIO mode instead of logging mode
Diffstat (limited to 'init')
| -rw-r--r-- | init/builtins.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp index 75971ce20..dddd6e448 100644 --- a/init/builtins.cpp +++ b/init/builtins.cpp @@ -642,7 +642,7 @@ static int do_sysclktz(const std::vector<std::string>& args) { static int do_verity_load_state(const std::vector<std::string>& args) { int mode = -1; int rc = fs_mgr_load_verity_state(&mode); - if (rc == 0 && mode == VERITY_MODE_LOGGING) { + if (rc == 0 && mode != VERITY_MODE_DEFAULT) { ActionManager::GetInstance().QueueEventTrigger("verity-logging"); } return rc; |