chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
service: increase default timeout for sysv scripts to 3min
[elogind.git]
/
src
/
service.c
diff --git
a/src/service.c
b/src/service.c
index 116e539d951df7303039759645589b54b0e49342..195f04a3150a4c16fd1cd7294861983193c0d410 100644
(file)
--- a/
src/service.c
+++ b/
src/service.c
@@
-39,6
+39,9
@@
#define NEWLINES "\n\r"
#ifdef HAVE_SYSV_COMPAT
#define NEWLINES "\n\r"
#ifdef HAVE_SYSV_COMPAT
+
+#define DEFAULT_SYSV_TIMEOUT_USEC (3*USEC_PER_MINUTE)
+
typedef enum RunlevelType {
RUNLEVEL_UP,
RUNLEVEL_DOWN,
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;
/* 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;
/* Special setting for all SysV services */
s->type = SERVICE_FORKING;