Package: systemd
Version: 204-2
Severity: normal
Tags: patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
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`).
Attached is a simple patch that changes systemd-cryptsetup to recognize
'discard' option instead of 'allow-discards'.
- -- System Information:
Debian Release: jessie/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.11.0-rc4_x230.git.x86_64+ (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages systemd depends on:
ii initscripts 2.88dsf-43
ii libacl1 2.2.52-1
ii libaudit0 1:1.7.18-1.1
ii libc6 2.17-7
ii libcap2 1:2.22-1.2
ii libcryptsetup4 2:1.4.3-4
ii libdbus-1-3 1.6.12-1
ii libgcrypt11 1.5.3-1
ii libkmod2 9-3
ii liblzma5 5.1.1alpha+20120614-2
ii libpam0g 1.1.3-9
ii libselinux1 2.1.13-2
ii libsystemd-daemon0 204-2
ii libsystemd-journal0 204-2
ii libudev1 204-2
ii libwrap0 7.6.q-24
ii udev 204-2
ii util-linux 2.20.1-5.5
Versions of packages systemd recommends:
ii libpam-systemd 204-2
Versions of packages systemd suggests:
pn systemd-ui <none>
- -- Configuration Files:
/etc/systemd/bootchart.conf changed [not included]
/etc/systemd/journald.conf changed [not included]
/etc/systemd/logind.conf changed [not included]
/etc/systemd/system.conf changed [not included]
/etc/systemd/user.conf changed [not included]
- -- no debconf information
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.14 (GNU/Linux)
iQIcBAEBCgAGBQJSBB6UAAoJENRBSF0fzYwlr94P/iKXGvUmlgkT7GlzdnTGM+Qw
WBYNdGqbsNaACab3Vb89Vu2X+eRhfyBJUCW5bH+BAFvxVPPYqrL3GTGRgyIiqS6M
h4Wq9rQ/v1o0S1N6W8+QRK7+5vJGrRGHpxQGqeq9sNkIUmFI5o027FAHOfZQPOc4
LDJOYlZ2Qds35xsxlnQrSUkD1Yy8KfWKbuyqNwdSa/GxyO0tEkh8CrHmSwMnvkJw
nHI4YL2sh8siORmncpPH/tmr2X8019/zecVufusJ5ftNgRXegN3QOi4FYa1XM3Rr
Rr9Hjro4Fs5P7UTY5GJMq4b2qvXtRK4HMGG8g7cvYZY/yLgSf7QFwH40ZolzyXR2
g74h51S/EGornL5MLbiZiqZG6VJfQV4dP+M9o2euRDBo+BDV0Zf0o8T6/S+bQYMk
QaQDOFsvkXwveNWfplyes1uHOz6uMwCwxCu+q+xbMQI+IjPFrNV0MiTXbqyJ6vqT
RamFGAyI6GHdT38Wgj5kGLm970aEnXBFcHJlixMfol8tCIsrYcndIxPvTZjrsaw8
OQODaDoEP4z9XM4PKXTQBwK7OU0yXm7QdgApcP09DIG6PnbUcROqQkaLiuSFogRY
MzO9zuRlFQa0wQd4T7Qbz4wGOzu5wUvl3bLCUo9tK+jywWKlfFXrTJJr+3hPVUaA
K6CdVf3R5aojvysuYJ7s
=1r6M
-----END PGP SIGNATURE-----
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index 3a2cfe4..1014473 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, "discard"))
opt_discards = true;
else if (streq(option, "luks"))
opt_type = CRYPT_LUKS1;
