File service-flags-sysv-service-with-detected-pid-as... of Package systemd

Overview Repositories Revisions Requests Users Attributes Meta

File service-flags-sysv-service-with-detected-pid-as-RemainAfte.patch of Package systemd (Revision a6b31e25f246b76c91b18d759bc3d194)

Currently displaying revision a6b31e25f246b76c91b18d759bc3d194 , Show latest

From: Frederic Crozat <fcrozat@suse.com>
Date: Fri, 30 Sep 2011 12:58:17 +0200
Subject: service: flags sysv service with detected pid as
 RemainAfterExit=false

LSB header doesn't give pidfile, so all LSB initscripts have
RemainAfterExit=false, causing daemon termination to not be reported as
such by systemd. Checking at startup if daemon is still running for
sysv initscript to disable RemainAfterExit helps a lot.
Fixes https://bugzilla.novell.com/show_bug.cgi?id=721426
---
 src/core/service.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/core/service.c b/src/core/service.c
index 08fc97c..5118b06 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -2072,8 +2072,13 @@ static void service_enter_running(Service *s, ServiceResult f) {
         cgroup_ok = cgroup_good(s);
 
         if ((main_pid_ok > 0 || (main_pid_ok < 0 && cgroup_ok != 0)) &&
-            (s->bus_name_good || s->type != SERVICE_DBUS))
+            (s->bus_name_good || s->type != SERVICE_DBUS)) {
+#ifdef HAVE_SYSV_COMPAT
+                if (s->sysv_enabled && !s->pid_file)
+                        s->remain_after_exit = false;
+#endif
                 service_set_state(s, SERVICE_RUNNING);
+        }
         else if (s->remain_after_exit)
                 service_set_state(s, SERVICE_EXITED);
         else

Places

File service-flags-sysv-service-with-detected-pid-as-RemainAfte.patch of Package systemd (Revision a6b31e25f246b76c91b18d759bc3d194)

Places