diff options
| author | Tom Cherry <tomcherry@google.com> | 2019-04-17 16:15:51 -0700 |
|---|---|---|
| committer | Tom Cherry <tomcherry@google.com> | 2019-04-19 16:53:33 -0700 |
| commit | f7545cea34695bb49531104d7f68e95b86254fbb (patch) | |
| tree | 43b93091b33ca92e731bb88e204723d80131b761 /init/builtins.cpp | |
| parent | 9b33cbc0cbe92e7f1e60f7b8a3c2fc35976aadbc (diff) | |
Vboot1.0: remove code to read verity state in userspace
The code to read verity state in userspace is deprecated in favor of
having the bootloader read and report the state, so this change
removes this now unused code.
Bug: 73456517
Test: boot
Change-Id: Ib626fd61850bce3016179ca92a9831c2ac29c032
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}}}, |