summaryrefslogtreecommitdiff
path: root/src/cryptsetup.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-11-14 02:08:31 +0100
committerLennart Poettering <lennart@poettering.net>2010-11-14 19:59:10 +0100
commit1fc7633598538fc5005e679da9ae5ce042376029 (patch)
treed5b2d9113af4c52c31d963eedcac734e597194e6 /src/cryptsetup.c
parente2d480b9d192cef125a531aa5eec574827c69b44 (diff)
cryptsetup: handle password=none properly
Diffstat (limited to 'src/cryptsetup.c')
-rw-r--r--src/cryptsetup.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/cryptsetup.c b/src/cryptsetup.c
index 91a4436ae1..c007b87c7a 100644
--- a/src/cryptsetup.c
+++ b/src/cryptsetup.c
@@ -37,6 +37,18 @@ static bool opt_readonly = false;
static bool opt_verify = false;
static usec_t opt_timeout = 0;
+/* Options Debian's crypttab knows we don't:
+
+ offset=
+ skip=
+ precheck=
+ check=
+ checkargs=
+ noearly=
+ loud=
+ keyscript=
+*/
+
static int parse_one_option(const char *option) {
assert(option);
@@ -155,7 +167,10 @@ int main(int argc, char *argv[]) {
goto finish;
}
- if (argc >= 5 && argv[4][0] && !streq(argv[4], "-")) {
+ if (argc >= 5 &&
+ argv[4][0] &&
+ !streq(argv[4], "-") &&
+ !streq(argv[4], "none")) {
if (!path_is_absolute(argv[4]))
log_error("Password file path %s is not absolute. Ignoring.", argv[4]);