From 11597f2b2f4be71f7257b051d99322f08484cec9 Mon Sep 17 00:00:00 2001 From: Karol Lewandowski Date: Thu, 13 May 2021 16:28:15 +0200 Subject: [PATCH] Revert "Description : adding force option to reboot command." This reverts commit e03bd8dae27026782e1cf524b78f87637238cf5c. Description is not enough to keep this, and quite likely the problem is long gone. Tizen uses it's own shutdown program (deviced-shutdown) from around Tizen 5.x, which handles the shutdown sequence exactly as wanted. Right now it actually causes more harm than good, as it makes impossible to run any action for two out of four "shutdown" actions. Change-Id: I871ffa573fefbb280a5b23e4cd62727dda478eb5 --- src/systemctl/systemctl.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 275bac0..68b6828 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -8812,15 +8812,6 @@ static int halt_parse_argv(int argc, char *argv[]) { return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Too many arguments."); - /* FIXME from systemd-216 of tizen-2.4 */ - /* Now, in Tizen, some of services are hardly not - * terminated. At last, time-out occurred. It can make serious - * problem in shutdown process. Until we solve this problem - * reboot is performed forcedly. */ - if (arg_action == ACTION_REBOOT || - arg_action == ACTION_POWEROFF) - arg_force = 2; - return 1; } -- 2.7.4