diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-04-14 02:36:02 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-04-16 02:03:34 +0200 |
| commit | 9072492933eaacbcd8daed3f9baf90583dd22574 (patch) | |
| tree | 9379d0cafb4625cc9214c504f38d269e642ee765 /src | |
| parent | ef9eb0a8976140654827d479af1f4256fae6afe3 (diff) | |
crypto: let the cryptsetup binary handles its own configurable timeouts
Diffstat (limited to 'src')
| -rw-r--r-- | src/cryptsetup-generator.c | 1 | ||||
| -rw-r--r-- | src/cryptsetup.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/cryptsetup-generator.c b/src/cryptsetup-generator.c index 9b62e6a6d3..b57c0b742a 100644 --- a/src/cryptsetup-generator.c +++ b/src/cryptsetup-generator.c @@ -115,6 +115,7 @@ static int create_disk( "\n[Service]\n" "Type=oneshot\n" "RemainAfterExit=yes\n" + "TimeoutSec=0\n" /* the binary handles timeouts anyway */ "ExecStart=" SYSTEMD_CRYPTSETUP_PATH " attach '%s' '%s' '%s' '%s'\n" "ExecStop=" SYSTEMD_CRYPTSETUP_PATH " detach '%s'\n", name, u, strempty(password), strempty(options), diff --git a/src/cryptsetup.c b/src/cryptsetup.c index f52a41b995..4ef9606d39 100644 --- a/src/cryptsetup.c +++ b/src/cryptsetup.c @@ -40,7 +40,7 @@ static char *opt_hash = NULL; static unsigned opt_tries = 0; static bool opt_readonly = false; static bool opt_verify = false; -static usec_t opt_timeout = 0; +static usec_t opt_timeout = DEFAULT_TIMEOUT_USEC; /* Options Debian's crypttab knows we don't: |