def: lower default timeout to 90s

Almost everybody found 3min too long, so lower it again

diff --git a/TODO b/TODO
index 887054406c3de0d3f2fcf10ec0640e95e1ba4fad..a7a4fc065b7e95ffcdc3a1661b4244062662f3cc 100644 (file)
--- 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 50aec3403ae4dcbf70ba0f99455007d5a6e9d382..6d142230d0afdbf51d8f203f1af61335f5e95337 100644 (file)
--- a/man/systemd-ask-password.xml
+++ b/man/systemd-ask-password.xml
@@ -129,7 +129,7 @@
 
                                 <listitem><para>Specify the query
                                 timeout in seconds. Defaults to
-                                3min.</para></listitem>
+                                90s.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>

diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index 40d236b266e18eaa9e48ab04cb3c3cc5792509f5..d397c896da50394cc49df207c156b267a62b3920 100644 (file)
--- 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.</para></listitem>
+                                90s.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>

diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 335169a397577593a50f5896c019b0c5963469f9..4f1102021f2b2864e08cf60dc5656ce88654699f 100644 (file)
--- 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.</para></listitem>
+                                90s.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>

diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index d651c1448628deb04ffe31570ca7244fe0432379..3ea3154db2152876213186c700c70c82e3e27c8e 100644 (file)
--- 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.</para></listitem>
+                                90s.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>

diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index 3277ddbd4e247f7c2765ba053cb83eed3efcc517..954e94412f4a21dd4792f5f8ce99fc6bc0dec987 100644 (file)
--- 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.</para></listitem>
+                                90s.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>

diff --git a/src/def.h b/src/def.h
index 958d1eb79c569cde05da2f5f3a7d54950b7dfe07..20aaa7c580ef21ab3c622cd2886e902cfa97b5b3 100644 (file)
--- 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)