diff options
| author | Nikita Ioffe <ioffe@google.com> | 2020-02-10 17:22:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-02-10 17:22:03 +0000 |
| commit | 15e4f6fe5a20cf2b955e3e887868713ee16b42c9 (patch) | |
| tree | 9ed104cf6a35897a583f54c3853037c654285c83 /init/builtins.cpp | |
| parent | 1ac1d86b7d0fadbbe9bde3dd186fd0b48c3ba932 (diff) | |
| parent | 85ff4ab9a408dfca36a2696aec2bc1476a82ecd7 (diff) | |
Merge "Don't log userspace_reboot.started/finished properties from init"
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 60c3d40a7..200bfff7d 100644 --- a/init/builtins.cpp +++ b/init/builtins.cpp @@ -1309,17 +1309,6 @@ static Result<void> do_enter_default_mount_ns(const BuiltinArguments& args) { } } -static Result<void> do_finish_userspace_reboot(const BuiltinArguments&) { - LOG(INFO) << "Userspace reboot successfully finished"; - boot_clock::time_point now = boot_clock::now(); - SetProperty("sys.init.userspace_reboot.last_finished", - std::to_string(now.time_since_epoch().count())); - if (!android::sysprop::InitProperties::userspace_reboot_in_progress(false)) { - return Error() << "Failed to set sys.init.userspace_reboot.in_progress property"; - } - return {}; -} - // Builtin-function-map start const BuiltinFunctionMap& GetBuiltinFunctionMap() { constexpr std::size_t kMax = std::numeric_limits<std::size_t>::max(); @@ -1341,7 +1330,6 @@ const BuiltinFunctionMap& GetBuiltinFunctionMap() { {"exec_background", {1, kMax, {false, do_exec_background}}}, {"exec_start", {1, 1, {false, do_exec_start}}}, {"export", {2, 2, {false, do_export}}}, - {"finish_userspace_reboot", {0, 0, {false, do_finish_userspace_reboot}}}, {"hostname", {1, 1, {true, do_hostname}}}, {"ifup", {1, 1, {true, do_ifup}}}, {"init_user0", {0, 0, {false, do_init_user0}}}, |