From 1acbb95c2b58373909d1e7a09a2eed0f6595cf6e Mon Sep 17 00:00:00 2001 From: Ondrej Balaz Date: Fri, 9 Aug 2013 20:37:52 +0200 Subject: [PATCH] =?utf8?q?systemd-cryptsetup:=20makes=20=E2=80=9Cdiscard?= =?utf8?q?=E2=80=9D=20a=20synonym=20for=20=E2=80=9Callow-discards=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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.] --- man/crypttab.xml | 2 +- src/cryptsetup/cryptsetup.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/man/crypttab.xml b/man/crypttab.xml index 5aade57c4..15c86d389 100644 --- a/man/crypttab.xml +++ b/man/crypttab.xml @@ -112,7 +112,7 @@ - allow-discards + discard 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 3a2cfe459..ba0fdbc8e 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; -- 2.30.2