chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cf37cd2
)
cryptsetup: fix nofail support
author
Tom Gundersen
<teg@jklm.no>
Wed, 21 Nov 2012 11:30:47 +0000
(12:30 +0100)
committer
Tom Gundersen
<teg@jklm.no>
Wed, 21 Nov 2012 11:53:28 +0000
(12:53 +0100)
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'.
src/cryptsetup/cryptsetup.c
patch
|
blob
|
history
diff --git
a/src/cryptsetup/cryptsetup.c
b/src/cryptsetup/cryptsetup.c
index 56a3b50974671114551ab1ef58a1048a68a09215..f33284370c0d7c3d588116198abe30ac67cb7d77 100644
(file)
--- 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=")) {