From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 8 Oct 2010 00:49:44 +0000 (+0200)
Subject: service: increase default timeout for sysv scripts to 3min
X-Git-Tag: v12~261
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=f34277d9117cd9d858f7332eef0023e05277ce74

service: increase default timeout for sysv scripts to 3min

For SysV services we cannot set the timeout inside the configuration
file. Hence let's pick a large timeout by default.

https://bugzilla.redhat.com/show_bug.cgi?id=635393
---

diff --git a/src/service.c b/src/service.c
index 116e539d9..195f04a31 100644
--- a/src/service.c
+++ b/src/service.c
@@ -39,6 +39,9 @@
 #define NEWLINES "\n\r"
 
 #ifdef HAVE_SYSV_COMPAT
+
+#define DEFAULT_SYSV_TIMEOUT_USEC (3*USEC_PER_MINUTE)
+
 typedef enum RunlevelType {
         RUNLEVEL_UP,
         RUNLEVEL_DOWN,
@@ -790,7 +793,8 @@ static int service_load_sysv_path(Service *s, const char *path) {
 
                 /* Don't timeout special services during boot (like fsck) */
                 s->timeout_usec = 0;
-        }
+        } else
+                s->timeout_usec = DEFAULT_SYSV_TIMEOUT_USEC;
 
         /* Special setting for all SysV services */
         s->type = SERVICE_FORKING;