diff options
| -rw-r--r-- | TODO | 8 | ||||
| -rw-r--r-- | man/systemd-ask-password.xml | 2 | ||||
| -rw-r--r-- | man/systemd.mount.xml | 2 | ||||
| -rw-r--r-- | man/systemd.service.xml | 2 | ||||
| -rw-r--r-- | man/systemd.socket.xml | 2 | ||||
| -rw-r--r-- | man/systemd.swap.xml | 2 | ||||
| -rw-r--r-- | src/def.h | 2 |
7 files changed, 13 insertions, 7 deletions
@@ -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 50aec3403a..6d142230d0 100644 --- 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 40d236b266..d397c896da 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.</para></listitem> + 90s.</para></listitem> </varlistentry> <varlistentry> diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 335169a397..4f1102021f 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.</para></listitem> + 90s.</para></listitem> </varlistentry> <varlistentry> diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml index d651c14486..3ea3154db2 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.</para></listitem> + 90s.</para></listitem> </varlistentry> <varlistentry> diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml index 3277ddbd4e..954e94412f 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.</para></listitem> + 90s.</para></listitem> </varlistentry> <varlistentry> @@ -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) |