2nd version of the patch

diff -Nru util-linux-2.29.1/debian/changelog util-linux-2.29.1/debian/changelog
--- util-linux-2.29.1/debian/changelog	2017-01-20 17:33:41.000000000 +0100
+++ util-linux-2.29.1/debian/changelog	2017-01-22 16:30:31.000000000 +0100
@@ -1,3 +1,9 @@
+util-linux (2.29.1-2) UNRELEASED; urgency=medium
+
+  * Enable weekly fstrim cronjob (Closes: #732054)
+
+ -- Laurent Bigonville <bi...@debian.org>  Sun, 22 Jan 2017 16:30:31 +0100
+
 util-linux (2.29.1-1) unstable; urgency=medium
 
   * Bump versions in shlibs to match recent symbols updates
diff -Nru util-linux-2.29.1/debian/rules util-linux-2.29.1/debian/rules
--- util-linux-2.29.1/debian/rules	2017-01-20 17:33:41.000000000 +0100
+++ util-linux-2.29.1/debian/rules	2017-01-22 16:30:31.000000000 +0100
@@ -174,6 +174,16 @@
 override_dh_fixperms:
 	dh_fixperms -i -s -Xusr/bin/wall -Xbin/mount -Xbin/umount
 
+override_dh_installcron:
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+	dh_installcron -putil-linux --name=fstrim
+endif
+	dh_installcron
+
+override_dh_systemd_start:
+	dh_systemd_start -putil-linux --no-start fstrim.service
+	dh_systemd_start -Nutil-linux
+
 override_dh_auto_test:
 ifeq ($(DEB_HOST_ARCH_OS), linux)
 	dh_auto_test --max-parallel=1
diff -Nru util-linux-2.29.1/debian/util-linux.fstrim.cron.weekly util-linux-2.29.1/debian/util-linux.fstrim.cron.weekly
--- util-linux-2.29.1/debian/util-linux.fstrim.cron.weekly	1970-01-01 01:00:00.000000000 +0100
+++ util-linux-2.29.1/debian/util-linux.fstrim.cron.weekly	2017-01-22 16:30:31.000000000 +0100
@@ -0,0 +1,8 @@
+#!/bin/sh
+# trim all mounted file systems which support it
+
+set -e
+
+if [ ! -d /run/systemd/system -a -x /sbin/fstrim ]; then
+	/sbin/fstrim -a > /dev/null
+fi
diff -Nru util-linux-2.29.1/debian/util-linux.install util-linux-2.29.1/debian/util-linux.install
--- util-linux-2.29.1/debian/util-linux.install	2017-01-20 17:33:41.000000000 +0100
+++ util-linux-2.29.1/debian/util-linux.install	2017-01-22 14:24:18.000000000 +0100
@@ -7,8 +7,8 @@
 [linux-any] sbin/mkswap
 [!linux-any] debian/tmp/sbin/mkswap => /sbin/mkswap.linux
 # weekly fstrim only available on linux
-[linux-any] lib/systemd/system/fstrim.timer => /usr/share/doc/util-linux/examples/fstrim.timer
-[linux-any] lib/systemd/system/fstrim.service => /usr/share/doc/util-linux/examples/fstrim.service
+[linux-any] lib/systemd/system/fstrim.timer
+[linux-any] lib/systemd/system/fstrim.service
 bin/more
 bin/mountpoint
 sbin/agetty

Reply via email to