From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 21 Apr 2025 04:14:30 +0000 (+0900)
Subject: systemctl/halt: drop support for calling in SysV init script
X-Git-Tag: v258-rc1~58^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5572fb18c063a0b4706b1c491cd90e72797dffbd;p=thirdparty%2Fsystemd.git

systemctl/halt: drop support for calling in SysV init script

Traditionally, halt is called at the end of the init script on
reboot/shutdown. To support such usecase, previously we read the current
runlevel from utmp and set force flag on reboot/shutdown.

This drops the support for such the usecase.
Note, neither supported nor tested, but hopefully still the command can
be used in the end of the sysv init script by specifying -ff.
---

diff --git a/src/systemctl/systemctl-compat-halt.c b/src/systemctl/systemctl-compat-halt.c
index 0b05fe6702c..c360a8d0073 100644
--- a/src/systemctl/systemctl-compat-halt.c
+++ b/src/systemctl/systemctl-compat-halt.c
@@ -77,16 +77,11 @@ int halt_parse_argv(int argc, char *argv[]) {
                 {}
         };
 
-        int c, r, runlevel;
+        int c, r;
 
         assert(argc >= 0);
         assert(argv);
 
-        /* called in sysvinit system as last command in shutdown/reboot so this is always forceful */
-        if (utmp_get_runlevel(&runlevel, NULL) >= 0)
-                if (IN_SET(runlevel, '0', '6'))
-                        arg_force = 2;
-
         while ((c = getopt_long(argc, argv, "pfwdnih", options, NULL)) >= 0)
                 switch (c) {