Package: util-linux
Followup-For: Bug #732054
Hi,
Please find a patch attached in the this mail.
Cheers,
Laurent Bigonville
-- System Information:
Debian Release: 9.0
APT prefers unstable-debug
APT policy: (500, 'unstable-debug'), (500, 'unstable'), (1,
'experimental-debug'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.9.0-1-amd64 (SMP w/8 CPU cores)
Locale: LANG=fr_BE.UTF-8, LC_CTYPE=fr_BE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
Versions of packages util-linux depends on:
ii init-system-helpers 1.47
ii libblkid1 2.29.1-1
ii libc6 2.24-9
ii libfdisk1 2.29.1-1
ii libmount1 2.29.1-1
ii libncursesw5 6.0+20161126-1
ii libpam0g 1.1.8-3.5
ii libselinux1 2.6-3
ii libsmartcols1 2.29.1-1
ii libsystemd0 232-12
ii libtinfo5 6.0+20161126-1
ii libudev1 232-12
ii libuuid1 2.29.1-1
ii zlib1g 1:1.2.8.dfsg-4
util-linux recommends no packages.
Versions of packages util-linux suggests:
ii dosfstools 4.0-2
ii kbd 2.0.3-2
ii util-linux-locales 2.29.1-1
-- debconf information excluded
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:23:21.000000000 +0100
@@ -174,6 +174,14 @@
override_dh_fixperms:
dh_fixperms -i -s -Xusr/bin/wall -Xbin/mount -Xbin/umount
+override_dh_installcron:
+ dh_installcron -putil-linux --name=fstrim
+ 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:08:33.000000000 +0100
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+if [ ! -d /run/systemd/system -a -x /sbin/fstrim ]; then
+ 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
