From ecb963cc40a0270a357c2640d368b3116e0f56b6 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 27 Apr 2011 22:29:29 +0200 Subject: [PATCH] def: lower default timeout to 90s Almost everybody found 3min too long, so lower it again --- TODO | 8 +++++++- man/systemd-ask-password.xml | 2 +- man/systemd.mount.xml | 2 +- man/systemd.service.xml | 2 +- man/systemd.socket.xml | 2 +- man/systemd.swap.xml | 2 +- src/def.h | 2 +- 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/TODO b/TODO index 887054406..a7a4fc065 100644 --- a/TODO +++ b/TODO @@ -30,6 +30,10 @@ F15 External: Features: +* introduce dbus calls for enabling/disabling a service + +* support notifications for services being enabled/disabled + * Maybe merge nss-myhostname into systemd? * ensure we strip empty directories from search path @@ -38,7 +42,9 @@ Features: * GC unreferenced jobs (such as .device jobs) -* support wildcard expansion in ListeStream= and friends +* support wildcard expansion in ListenStream= and friends + +* support wildcard expansion in EnvironmentFile= and friends * avoid DefaultStandardOutput=syslog to have any effect on StandardInput=socket services diff --git a/man/systemd-ask-password.xml b/man/systemd-ask-password.xml index 50aec3403..6d142230d 100644 --- a/man/systemd-ask-password.xml +++ b/man/systemd-ask-password.xml @@ -129,7 +129,7 @@ Specify the query timeout in seconds. Defaults to - 3min. + 90s. diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml index 40d236b26..d397c896d 100644 --- a/man/systemd.mount.xml +++ b/man/systemd.mount.xml @@ -212,7 +212,7 @@ a time span value such as "5min 20s". Pass 0 to disable the timeout logic. Defaults to - 3min. + 90s. diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 335169a39..4f1102021 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -448,7 +448,7 @@ time span value such as "5min 20s". Pass 0 to disable the timeout logic. Defaults to - 3min. + 90s. diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml index d651c1448..3ea3154db 100644 --- a/man/systemd.socket.xml +++ b/man/systemd.socket.xml @@ -541,7 +541,7 @@ a time span value such as "5min 20s". Pass 0 to disable the timeout logic. Defaults to - 3min. + 90s. diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml index 3277ddbd4..954e94412 100644 --- a/man/systemd.swap.xml +++ b/man/systemd.swap.xml @@ -166,7 +166,7 @@ a time span value such as "5min 20s". Pass 0 to disable the timeout logic. Defaults to - 3min. + 90s. diff --git a/src/def.h b/src/def.h index 958d1eb79..20aaa7c58 100644 --- a/src/def.h +++ b/src/def.h @@ -24,7 +24,7 @@ #include "util.h" -#define DEFAULT_TIMEOUT_USEC (3*USEC_PER_MINUTE) +#define DEFAULT_TIMEOUT_USEC (90*USEC_PER_SEC) #define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC) #define DEFAULT_EXIT_USEC (5*USEC_PER_MINUTE) -- 2.30.2