chiark / gitweb /
service: increase default timeout for sysv scripts to 3min
authorLennart Poettering <lennart@poettering.net>
Fri, 8 Oct 2010 00:49:44 +0000 (02:49 +0200)
committerLennart Poettering <lennart@poettering.net>
Fri, 8 Oct 2010 00:49:44 +0000 (02:49 +0200)
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

src/service.c

index 116e539..195f04a 100644 (file)
@@ -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;