diff options
| author | Tom Cherry <tomcherry@google.com> | 2019-05-06 23:41:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-05-06 23:41:47 +0000 |
| commit | 1cd30df584aaa6580fd6d6ac994b8a0a07671e03 (patch) | |
| tree | fda2697a4719c65356d0cc2904592e7717ecba23 /init/builtins.cpp | |
| parent | 0cd8102bbd12fc1ebe01e5efd139368936c190f9 (diff) | |
| parent | f7545cea34695bb49531104d7f68e95b86254fbb (diff) | |
Merge "Vboot1.0: remove code to read verity state in userspace"
Diffstat (limited to 'init/builtins.cpp')
| -rw-r--r-- | init/builtins.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp index 06da4be9a..62e0f8fa6 100644 --- a/init/builtins.cpp +++ b/init/builtins.cpp @@ -707,17 +707,6 @@ static Result<Success> do_sysclktz(const BuiltinArguments& args) { return Success(); } -static Result<Success> do_verity_load_state(const BuiltinArguments& args) { - int mode = -1; - bool loaded = fs_mgr_load_verity_state(&mode); - if (loaded && mode != VERITY_MODE_DEFAULT) { - ActionManager::GetInstance().QueueEventTrigger("verity-logging"); - } - if (!loaded) return Error() << "Could not load verity state"; - - return Success(); -} - static Result<Success> do_verity_update_state(const BuiltinArguments& args) { int mode; if (!fs_mgr_load_verity_state(&mode)) { @@ -1150,7 +1139,6 @@ const BuiltinFunctionMap::Map& BuiltinFunctionMap::map() const { {"symlink", {2, 2, {true, do_symlink}}}, {"sysclktz", {1, 1, {false, do_sysclktz}}}, {"trigger", {1, 1, {false, do_trigger}}}, - {"verity_load_state", {0, 0, {false, do_verity_load_state}}}, {"verity_update_state", {0, 0, {false, do_verity_update_state}}}, {"wait", {1, 2, {true, do_wait}}}, {"wait_for_prop", {2, 2, {false, do_wait_for_prop}}}, |