summaryrefslogtreecommitdiff
path: root/src/initctl.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-04-14 02:32:42 +0200
committerLennart Poettering <lennart@poettering.net>2011-04-16 02:03:34 +0200
commitef9eb0a8976140654827d479af1f4256fae6afe3 (patch)
tree58bd61dac18d174264c6366ed5ad533a099efc20 /src/initctl.c
parent7f434cf4c9a72c3291a8603a3e91dd66dde4d640 (diff)
logger,initctl: use global exit timeout
Diffstat (limited to 'src/initctl.c')
-rw-r--r--src/initctl.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/initctl.c b/src/initctl.c
index 15da4593d0..dd743142fd 100644
--- a/src/initctl.c
+++ b/src/initctl.c
@@ -42,9 +42,10 @@
#include "special.h"
#include "sd-daemon.h"
#include "dbus-common.h"
+#include "def.h"
#define SERVER_FD_MAX 16
-#define TIMEOUT ((int) (10*MSEC_PER_SEC))
+#define TIMEOUT_MSEC ((int) (DEFAULT_EXIT_USEC/USEC_PER_MSEC))
typedef struct Fifo Fifo;
@@ -388,7 +389,7 @@ int main(int argc, char *argv[]) {
if ((k = epoll_wait(server.epoll_fd,
&event, 1,
- TIMEOUT)) < 0) {
+ TIMEOUT_MSEC)) < 0) {
if (errno == EINTR)
continue;