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:
e2d480b
)
cryptsetup: handle password=none properly
author
Lennart Poettering
<lennart@poettering.net>
Sun, 14 Nov 2010 01:08:31 +0000
(
02:08
+0100)
committer
Lennart Poettering
<lennart@poettering.net>
Sun, 14 Nov 2010 18:59:10 +0000
(19:59 +0100)
src/cryptsetup.c
patch
|
blob
|
history
diff --git
a/src/cryptsetup.c
b/src/cryptsetup.c
index 91a4436ae1531f75bb75230817ca35dfba63f20a..c007b87c7ab0c0c67174c54dd728c79ae01763df 100644
(file)
--- 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;
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);
static int parse_one_option(const char *option) {
assert(option);
@@
-155,7
+167,10
@@
int main(int argc, char *argv[]) {
goto finish;
}
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]);
if (!path_is_absolute(argv[4]))
log_error("Password file path %s is not absolute. Ignoring.", argv[4]);