crypto: let the cryptsetup binary handles its own configurable timeouts

diff --git a/src/cryptsetup-generator.c b/src/cryptsetup-generator.c
index 9b62e6a6d3c62ccf3f9fece7cd203c64eeebca11..b57c0b742ab141f84990edd1ee6f3d1f6d5a6f50 100644 (file)
--- 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 f52a41b995dbe8ca4bbf253daa72ef589eea5b57..4ef9606d39fabc415e003ab0736ab426a9f7618a 100644 (file)
--- 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: