Package: systemd
Version: 204-2
Followup-For: Bug #719167
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Revised version of patch recognizes both upstream 'allow-discards' and
Debian 'discard' option and thus should be suitable for merge with
upstream.
- -- 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.10.5_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)
iQIcBAEBCgAGBQJSBRXAAAoJENRBSF0fzYwl0Y8P/2Pa3frERpvFKm3LyzYZOkcu
8cnsDD6zAUAhzgcjnrbnTv/LhtXatvkR0MQe4SmoCzlhQ6amG5ncPSMb+9wCGH6u
RTqoMYpsMzvIYUiJ4iLXVbVPX0bHfVgNlo2C1htaWnB3TAW4JisE6UrQYSU6dlv+
br7xsMZdFVimodtWf4rSGZraF0Q9adtEKFfKL98CB16ZYjRt8DnrP0N69m845dXT
WHvWr4uW/NjfvWfjyivo7HH7AZ4zFB44iAlk/bw8NFT4YReGKTq3QlFmNnbbX9vd
oYvZoKnqiym09z9+GEeb/ChahDJ6FNNbQNOVMbk5s9/ujgqlfeKOb8ij7aVGMLPS
ZrGTN01WlZriXf8OXNFHFFNYf4M73sCkutxyqk3zfwl2QiffE1PP/I7ur9JNSI1z
QLAd3QNwBJud0qfx+Hp7dlyG6lo9/26fS06Bwv23EGLVdkCHHWHl1hOJxmbluyr8
hdnwjqqK5lJAB3dBnWKgc+kjJqHpue92hy0VUendGXEPmx92osQGC5DCtdLinx4Y
G7piNRC+uTUZiEy2qOZK0MePtdi0ISKP+Saih9i60eFrJTLn3YNLXyAkmGaRZYg4
Tlzr1Nf4xVIZuaUk0J/Kjd4yMpHBSMPDInXvpgn592njGBCS0DhbPEXnXX2l7EnY
OEjWozvSjfmhwJv93YzL
=yTM4
-----END PGP SIGNATURE-----
>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
