diff options
author | Tom Cherry <tomcherry@google.com> | 2018-12-07 14:09:37 -0800 |
---|---|---|
committer | Tom Cherry <tomcherry@google.com> | 2018-12-07 14:14:54 -0800 |
commit | 02eff5cccde41be4a5514c9ceba9e126957329ba (patch) | |
tree | 0a06aa9c17a7b59fe58fab192556926bb496e7a0 /init/builtins.cpp | |
parent | 215d1d510ea1d1f076716ab9303f87cbcd8bcacc (diff) |
Update fs_mgr_update_verity_state() for new C++ Fstab
Bug: 62292478
Test: boot and check verity state
Change-Id: I4912a16ada9a6d72480d7ac905654b764c5d18b6
Diffstat (limited to 'init/builtins.cpp')
-rw-r--r-- | init/builtins.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp index b382126ca..2bebe7673 100644 --- a/init/builtins.cpp +++ b/init/builtins.cpp @@ -734,13 +734,10 @@ static Result<Success> do_verity_load_state(const BuiltinArguments& args) { return Success(); } -static void verity_update_property(fstab_rec *fstab, const char *mount_point, - int mode, int status) { - property_set("partition."s + mount_point + ".verified", std::to_string(mode)); -} - static Result<Success> do_verity_update_state(const BuiltinArguments& args) { - if (!fs_mgr_update_verity_state(verity_update_property)) { + if (!fs_mgr_update_verity_state([](const std::string& mount_point, int mode) { + property_set("partition." + mount_point + ".verified", std::to_string(mode)); + })) { return Error() << "fs_mgr_update_verity_state() failed"; } return Success(); |