diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-02-11 04:13:27 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-02-11 04:13:27 +0000 |
| commit | 7b75d2c07a08a751ec9cc3e5b19c59e7ed971f2a (patch) | |
| tree | 58649d1487d77ec7f248287f6766277370ed8ec6 /init/builtins.cpp | |
| parent | de1257c1ecba96b730bc316b843d05acf385ce2c (diff) | |
| parent | cc7a7da3290460beede6bd94a85c4fe96aed9263 (diff) | |
Snap for 6197114 from cc7a7da3290460beede6bd94a85c4fe96aed9263 to rvc-release
Change-Id: If2c0edae830182ab3ebcb6c160be30b290ed880d
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}}}, |