]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
distro/rpm: ensure GC is restarted on upgrade
authorTomas Krizek <tomas.krizek@nic.cz>
Fri, 31 Jan 2020 10:40:12 +0000 (11:40 +0100)
committerTomas Krizek <tomas.krizek@nic.cz>
Mon, 3 Feb 2020 13:40:46 +0000 (14:40 +0100)
distro/rpm/knot-resolver.spec

index 2d617f51816af3b7f201d3e112b313cb7f068302..9bfb8500b497222f77a10d91b3de4e00694e2bcf 100644 (file)
@@ -238,8 +238,13 @@ if [ -f ${UPG_DIR}/.unfinished ] ; then
 fi
 %endif
 
-# in case service files are updated
-systemctl daemon-reload &>/dev/null ||:
+# 5.0.1 fix to force restart of kres-cache-gc.service, which was missing in systemd_postun_with_restart
+# TODO: remove once most users upgrade to 5.0.1+
+systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 2 ] ; then
+        systemctl try-restart kres-cache-gc.service >/dev/null 2>&1 || :
+fi
+
 %systemd_post 'kresd@*.service'
 %tmpfiles_create %{_tmpfilesdir}/knot-resolver.conf
 %if "x%{?fedora}" == "x"
@@ -250,7 +255,7 @@ systemctl daemon-reload &>/dev/null ||:
 %systemd_preun kres-cache-gc.service kresd.target
 
 %postun
-%systemd_postun_with_restart 'kresd@*.service'
+%systemd_postun_with_restart 'kresd@*.service' kres-cache-gc.service
 %if "x%{?fedora}" == "x"
 /sbin/ldconfig
 %endif