crypto: let the cryptsetup binary handles its own configurable timeouts

This commit is contained in:
Lennart Poettering 2011-04-14 02:36:02 +02:00
parent ef9eb0a897
commit 9072492933
2 changed files with 2 additions and 1 deletions

View file

@ -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),

View file

@ -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: