[systemd-commits] man/crypttab.xml src/cryptsetup

[Zbigniew Jędrzejewski-Szmek]

 man/crypttab.xml            |    2 +-
 src/cryptsetup/cryptsetup.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1acbb95c2b58373909d1e7a09a2eed0f6595cf6e
Author: Ondrej Balaz <blami at blami.net>
Date:   Fri Aug 9 20:37:52 2013 +0200

    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.]

diff --git a/man/crypttab.xml b/man/crypttab.xml
index 5aade57..15c86d3 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 3a2cfe4..ba0fdbc 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;