service: 'pidfile:' in SysV chkconfig header implies a real daemon

The presence of the chkconfig "pidfile:" header in the initscript is an
excellent indication that it's not a oneshot script (like iptables),
but a real daemon (like httpd).

diff --git a/src/service.c b/src/service.c
index 165655eb124c8bc200d69f0e642eced721970932..5c7e62f3b0f3f24cf7430ba5c769891468d23e12 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -843,7 +843,7 @@ static int service_load_sysv_path(Service *s, const char *path) {
 
         /* Special setting for all SysV services */
         s->type = SERVICE_FORKING;
 
         /* Special setting for all SysV services */
         s->type = SERVICE_FORKING;

-        s->remain_after_exit = true;
+        s->remain_after_exit = !s->pid_file;

         s->restart = SERVICE_RESTART_NO;
         s->exec_context.std_output =
                 (s->meta.manager->sysv_console || s->exec_context.std_input == EXEC_INPUT_TTY)
         s->restart = SERVICE_RESTART_NO;
         s->exec_context.std_output =
                 (s->meta.manager->sysv_console || s->exec_context.std_input == EXEC_INPUT_TTY)