summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-04-14 02:30:43 +0200
committerLennart Poettering <lennart@poettering.net>2011-04-16 02:03:34 +0200
commit7f434cf4c9a72c3291a8603a3e91dd66dde4d640 (patch)
tree36ae4b563898b153a3109346daaa9684799bfbca
parent4fe60156fc45e34c7bcba4779123e15620532dff (diff)
ask-password: use default timeout
-rw-r--r--man/systemd-ask-password.xml3
-rw-r--r--src/ask-password.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/man/systemd-ask-password.xml b/man/systemd-ask-password.xml
index 7a6498d254..50aec3403a 100644
--- a/man/systemd-ask-password.xml
+++ b/man/systemd-ask-password.xml
@@ -128,7 +128,8 @@
<term><option>--timeout=</option></term>
<listitem><para>Specify the query
- timeout in seconds.</para></listitem>
+ timeout in seconds. Defaults to
+ 3min.</para></listitem>
</varlistentry>
<varlistentry>
diff --git a/src/ask-password.c b/src/ask-password.c
index 6330369b4f..5162f62eee 100644
--- a/src/ask-password.c
+++ b/src/ask-password.c
@@ -40,11 +40,12 @@
#include "util.h"
#include "strv.h"
#include "ask-password-api.h"
+#include "def.h"
static const char *arg_icon = NULL;
static const char *arg_message = NULL;
static bool arg_use_tty = true;
-static usec_t arg_timeout = 60 * USEC_PER_SEC;
+static usec_t arg_timeout = DEFAULT_TIMEOUT_USEC;
static bool arg_accept_cached = false;
static bool arg_multiple = false;