diff options
| author | Ondrej Balaz <blami@blami.net> | 2013-08-09 20:37:52 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-08-14 22:54:07 -0400 |
| commit | 1acbb95c2b58373909d1e7a09a2eed0f6595cf6e (patch) | |
| tree | 88cddf5bf7c21f3f7f4d2b3a0de88b05322ddde2 | |
| parent | 3e7f60ab32fc2a7d5244d10a0c4e1c3be838409d (diff) | |
systemd-cryptsetup: makes “discard” a synonym for “allow-discards”
systemd-cryptsetup recognizes option 'allow-discards' in /etc/crypttab
to enable TRIM passthrough to underlying encrypted device. In Debian
this option was changed to 'discard' to avoid hyphen in option name.
(see: #648868 and `man crypttab`).
[zj: update crypttab(5) too, making "discard" the default.]
| -rw-r--r-- | man/crypttab.xml | 2 | ||||
| -rw-r--r-- | src/cryptsetup/cryptsetup.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/man/crypttab.xml b/man/crypttab.xml index 5aade57c42..15c86d3897 100644 --- a/man/crypttab.xml +++ b/man/crypttab.xml @@ -112,7 +112,7 @@ <variablelist class='crypttab-options'> <varlistentry> - <term><varname>allow-discards</varname></term> + <term><varname>discard</varname></term> <listitem><para>Allow discard requests to be passed through the encrypted block device. This diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c index 3a2cfe459b..ba0fdbc8e8 100644 --- a/src/cryptsetup/cryptsetup.c +++ b/src/cryptsetup/cryptsetup.c @@ -129,7 +129,7 @@ static int parse_one_option(const char *option) { opt_readonly = true; else if (streq(option, "verify")) opt_verify = true; - else if (streq(option, "allow-discards")) + else if (streq(option, "allow-discards") || streq(option, "discard")) opt_discards = true; else if (streq(option, "luks")) opt_type = CRYPT_LUKS1; |