X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcryptsetup.c;fp=src%2Fcryptsetup.c;h=3aa822a1d020591f618e5f6e18b8faab467d65f4;hp=989734be1bc44badb3ca130ea14daaece34d1afd;hb=f6a6225e414858ff222d2b175369cc42459abf9a;hpb=b74949bcdc65982a5eaca64c836f4d2a3b8a8d0c diff --git a/src/cryptsetup.c b/src/cryptsetup.c index 989734be1..3aa822a1d 100644 --- a/src/cryptsetup.c +++ b/src/cryptsetup.c @@ -31,6 +31,7 @@ #include "util.h" #include "strv.h" #include "ask-password-api.h" +#include "def.h" static const char *opt_type = NULL; /* LUKS1 or PLAIN */ static char *opt_cipher = NULL; @@ -308,7 +309,7 @@ int main(int argc, char *argv[]) { if (opt_readonly) flags |= CRYPT_ACTIVATE_READONLY; - until = now(CLOCK_MONOTONIC) + (opt_timeout > 0 ? opt_timeout : 60 * USEC_PER_SEC); + until = now(CLOCK_MONOTONIC) + (opt_timeout > 0 ? opt_timeout : DEFAULT_TIMEOUT_USEC); opt_tries = opt_tries > 0 ? opt_tries : 3; opt_key_size = (opt_key_size > 0 ? opt_key_size : 256);