peter/infix
1
0
Fork 0
mirror of https://github.com/kernelkit/infix.git synced 2026-07-30 04:33:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

patches/finit: drop old v4.4 patches (on v4.6 now)

Browse Source 
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2023-12-14 16:40:41 +01:00
committed by Mattias Walström
parent 6d3d49d7fd
commit b6f8ec04b8
2 changed files with 0 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/finit/4.4/0001-initctl-force-create.patch
-36
View File
@@ -1,36 +0,0 @@
commit 5db2fb2c325807c67b38d18b454bbfc55b51b77f
Author: Joachim Wiberg <troglobit@gmail.com>
Date: Sat May 20 10:08:31 2023 +0200
initctl: let -f force-skip check for built-in service
When calling `initctl -b create` from a start script at bootstrap you
risk blocking the boot since Finit currently cannot reply to IPC during
that period.
This patch allows -f to override this builtin check for the following
initctl commands:
- touch
- show
- edit
- create
- delete
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
diff --git a/src/serv.c b/src/serv.c
index 570f5ac..2029ddd 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -41,6 +41,10 @@ static int is_builtin(char *arg)
{
svc_t *svc;
+ /* skip check, we may be in non-responsive bootstrap */
+ if (iforce)
+ return 0;
+
svc = client_svc_find(arg);
if (!svc)
return 0;
patches/finit/4.4/0002-fix-block-at-reboot.patch
-58
View File
@@ -1,58 +0,0 @@
From 6f0d448765d61a741add34baec422c24e357e7dc Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Tue, 27 Jun 2023 12:18:09 +0200
Subject: [PATCH] Fix #227: delayed service_kill() may stall shutdown/reboot
Organization: Addiva Elektronik
This turns out to be the root-cause of #227. Finit is waiting forever
for proceeses to stop at shutdown/reboot, while a subreaper has already
collected the PID, or Finit for some reason did not collect the PID.
When the process timeout calls service_kill() we now check if the kernel
actually knows of this process or not. If it's already been collected,
we can notify Finit of this by calling service_monitor() to clean up the
'svc' and in turn call sm_step() to finalize the state transition.
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
src/service.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/service.c b/src/service.c
index 21acd28..ddd7e4f 100644
--- a/src/service.c
+++ b/src/service.c
@@ -850,17 +850,26 @@ fail:
*/
static void service_kill(svc_t *svc)
{
+ char *nm, *id = svc_ident(svc, NULL, 0);
+
service_timeout_cancel(svc);
if (svc->pid <= 1) {
/* Avoid killing ourselves or all processes ... */
- dbg("%s: Aborting SIGKILL, already terminated.", svc_ident(svc, NULL, 0));
+ dbg("%s: Aborting SIGKILL, already terminated.", id);
return;
}
- dbg("%s: Sending SIGKILL to process group %d", pid_get_name(svc->pid, NULL, 0), svc->pid);
- logit(LOG_CONSOLE | LOG_NOTICE, "Stopping %s[%d], sending SIGKILL ...",
- svc_ident(svc, NULL, 0), svc->pid);
+ nm = pid_get_name(svc->pid, NULL, 0);
+ if (!nm) {
+ /* PID possibly monitored by someone else? */
+ dbg("%s: Aborting SIGKILL, PID[%d] no longer exists.", id, svc->pid);
+ service_monitor(svc->pid, 0);
+ return;
+ }
+
+ dbg("%s: Sending SIGKILL to process group %d", nm, svc->pid);
+ logit(LOG_CONSOLE | LOG_NOTICE, "Stopping %s[%d], sending SIGKILL ...", id, svc->pid);
if (runlevel != 1)
print_desc("Killing ", svc->desc);
--
2.34.1