Hi,

forwarding this patch we received in the Debian bugtracker.

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`).

The attached patch makes “discard” a synonym for “allow-discards” in
/etc/crypttab. Please merge it.

-- 
Best regards,
Michael
>From 4c7b781f336e71f4e8db82889d79132e04fd3cec Mon Sep 17 00:00:00 2001
From: Ondrej Balaz <bl...@blami.net>
Date: Fri, 9 Aug 2013 17:35:18 +0200
Subject: [PATCH] Recognize discard option in /etc/crypttab.

Signed-off-by: Ondrej Balaz <bl...@blami.net>
---
 src/cryptsetup/cryptsetup.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
-- 
1.7.10.4

_______________________________________________
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel

Reply via email to