sys-apps/systemd: add systemd patch from v252.12

If fixes an issue with Systemd service restart when the main process is being killed by a SIGHUP signal. See also: flatcar/Flatcar#1157 Commit-Ref: systemd/systemd-stable@34e834f Signed-off-by: Mathieu Tortuyaux <[email protected]>
flatcar · Aug 11, 2023 · e76a7a3 · e76a7a3
1 parent a56f23b
commit e76a7a3
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 0 deletions.
diff --git a/changelog/bugfixes/2023-08-10-systemd-restart-service.md b/changelog/bugfixes/2023-08-10-systemd-restart-service.md
@@ -0,0 +1 @@
+- Fixed the restart of Systemd services when the main process is being killed by a SIGHUP signal ([flatcar#1157](https://github.com/flatcar/Flatcar/issues/1157))
diff --git a/...sys-apps/systemd/files/0008-Revert-core-service-when-resetting-PID-also-reset-known.patch b/...sys-apps/systemd/files/0008-Revert-core-service-when-resetting-PID-also-reset-known.patch
@@ -0,0 +1,40 @@
+From 34e834f496338fdc2a8a8cc771cba4082079cf9a Mon Sep 17 00:00:00 2001
+From: msizanoen <[email protected]>
+Date: Mon, 12 Jun 2023 10:30:12 +0700
+Subject: [PATCH] Revert "core/service: when resetting PID also reset known
+ flag"
+
+This reverts commit ff32060f2ed37b68dc26256b05e2e69013b0ecfe.
+
+This change is incorrect as we don't want to mark the PID as invalid but
+only mark it as dead.
+
+The change in question also breaks user level socket activation for
+`podman.service` as the termination of the main `podman system service`
+process is not properly handled, causing any application accessing the
+socket to hang.
+
+This is because the user-level `podman.service` unit also hosts two
+non-main processes: `rootlessport` and `rootlessport-child` which causes
+the `cgroup_good` check to still succeed.
+
+The original submitter of this commit is recommended to find another
+more correct way to fix the cgroupsv1 issue on CentOS 8.
+
+(cherry picked from commit f29f0877c5abfd03060838d1812ea6fdff3b0b37)
+---
+ src/core/service.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/core/service.c b/src/core/service.c
+index c05f13c765..211f72900e 100644
+--- a/src/core/service.c
++++ b/src/core/service.c
+@@ -3529,7 +3529,6 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
+                         return;
+
+                 s->main_pid = 0;
+-                s->main_pid_known = false;
+                 exec_status_exit(&s->main_exec_status, &s->exec_context, pid, code, status);
+
+                 if (s->main_command) {
diff --git a/...ay/sys-apps/systemd/systemd-252.11.ebuild → ...sys-apps/systemd/systemd-252.11-r1.ebuild b/...ay/sys-apps/systemd/systemd-252.11.ebuild → ...sys-apps/systemd/systemd-252.11-r1.ebuild
@@ -248,6 +248,7 @@ src_prepare() {
 		"${FILESDIR}/0005-systemd-Disable-SELinux-permissions-checks.patch"
 		"${FILESDIR}/0006-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch"
 		"${FILESDIR}/0007-units-Keep-using-old-journal-file-format.patch"
+		"${FILESDIR}/0008-Revert-core-service-when-resetting-PID-also-reset-known.patch"
 	)
 
 	if ! use vanilla; then
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- Fixed the restart of Systemd services when the main process is being killed by a SIGHUP signal ([flatcar#1157](https://github.com/flatcar/Flatcar/issues/1157))