Bug#769734: systemd ignores swap discard option from /etc/fstab

[Aurelien Jarno]

Package: systemd
Version: 215-5+b1
Severity: important
Tags: patch upstream fixed-upstream

systemd ignores the discard option from /etc/fstab for swap entries, 
interpreting only the priority options. This option is important for
virtualization with thin-provisioning, and also for SSD even if some
people are discussing its usefulness. Anyway this is supported by the
kernel and other init systems (both in Wheezy and Jessie).

The problem has been fixed upstream in version 217. I have attached the
corresponding patches, they apply fine on the debian package (with only
one fuzzy hunk). I have tested them and the resulting packages works
correctly.

I know Jessie is now frozen, but given it is a regression from Wheezy
for people switching to systemd, it would be nice if they can be
included in Jessie anyway.

-- Package-specific info:

-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-4-amd64 (SMP w/8 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages systemd depends on:
ii  acl             2.2.52-2
ii  adduser         3.113+nmu3
ii  initscripts     2.88dsf-58
ii  libacl1         2.2.52-2
ii  libaudit1       1:2.4-1
ii  libblkid1       2.25.2-2
ii  libc6           2.19-13
ii  libcap2         1:2.24-6
ii  libcap2-bin     1:2.24-6
ii  libcryptsetup4  2:1.6.6-3
ii  libgcrypt20     1.6.2-4
ii  libkmod2        18-3
ii  liblzma5        5.1.1alpha+20120614-2+b1
ii  libpam0g        1.1.8-3.1
ii  libselinux1     2.3-2
ii  libsystemd0     215-5+b1
ii  sysv-rc         2.88dsf-58
ii  udev            215-5+b1
ii  util-linux      2.25.2-2

Versions of packages systemd recommends:
ii  dbus            1.8.10-1
ii  libpam-systemd  215-5+b1

Versions of packages systemd suggests:
pn  systemd-ui  <none>

-- Configuration Files:
/etc/systemd/timesyncd.conf changed [not included]

-- no debconf information
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-swap-introduce-Discard-property.patch
Type: text/x-diff
Size: 8873 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-systemd-maintainers/attachments/20141116/4ada03de/attachment-0006.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-fstab-generator-properly-deal-with-discard-as-non-la.patch
Type: text/x-diff
Size: 4469 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-systemd-maintainers/attachments/20141116/4ada03de/attachment-0007.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0003-core-swap-follow-the-configured-unit-by-default.patch
Type: text/x-diff
Size: 2159 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-systemd-maintainers/attachments/20141116/4ada03de/attachment-0008.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0004-core-swap-advertise-Discard-over-dbus.patch
Type: text/x-diff
Size: 2075 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-systemd-maintainers/attachments/20141116/4ada03de/attachment-0009.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0005-core-swap-only-make-configured-units-part-of-swap.ta.patch
Type: text/x-diff
Size: 2908 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-systemd-maintainers/attachments/20141116/4ada03de/attachment-0010.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0006-swap-replace-Discard-setting-by-a-more-generic-Optio.patch
Type: text/x-diff
Size: 12988 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-systemd-maintainers/attachments/20141116/4ada03de/attachment-0011.patch>