summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2012-11-21 12:30:47 +0100
committerTom Gundersen <teg@jklm.no>2012-11-21 12:53:28 +0100
commitadc40dc2f670a6298cce918fb318ba6a4b80c306 (patch)
tree3b03988cd663f0deacbd2c8654701bbdc76a80f4
parentcf37cd2f305db327e05f8e001f5d84887f4fdfeb (diff)
cryptsetup: fix nofail support
This was documented in the man page and supported in the generator, but systemd-cryptestup itself would fail with this option. systemd-cryptsetup should ignore 'nofail', as it does with 'noauto'.
-rw-r--r--src/cryptsetup/cryptsetup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index 56a3b50974..f33284370c 100644
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -62,7 +62,7 @@ static int parse_one_option(const char *option) {
assert(option);
/* Handled outside of this tool */
- if (streq(option, "noauto"))
+ if (streq(option, "noauto") || streq(option, "nofail"))
return 0;
if (startswith(option, "cipher=")) {