chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manager: serialize/deserialize max job id and /usr taint flag
[elogind.git]
/
src
/
cryptsetup.c
diff --git
a/src/cryptsetup.c
b/src/cryptsetup.c
index 989734be1bc44badb3ca130ea14daaece34d1afd..3aa822a1d020591f618e5f6e18b8faab467d65f4 100644
(file)
--- a/
src/cryptsetup.c
+++ b/
src/cryptsetup.c
@@
-31,6
+31,7
@@
#include "util.h"
#include "strv.h"
#include "ask-password-api.h"
#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;
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;
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_U
SEC);
opt_tries = opt_tries > 0 ? opt_tries : 3;
opt_key_size = (opt_key_size > 0 ? opt_key_size : 256);
opt_tries = opt_tries > 0 ? opt_tries : 3;
opt_key_size = (opt_key_size > 0 ? opt_key_size : 256);