From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Fri, 31 Jan 2020 10:40:12 +0000 (+0100)
Subject: distro/rpm: ensure GC is restarted on upgrade
X-Git-Tag: v5.0.1~1^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e9fe78bf6399d4ba174bb0d4b98cb963febeb70;p=thirdparty%2Fknot-resolver.git

distro/rpm: ensure GC is restarted on upgrade
---

diff --git a/distro/rpm/knot-resolver.spec b/distro/rpm/knot-resolver.spec
index 2d617f518..9bfb8500b 100644
--- a/distro/rpm/knot-resolver.spec
+++ b/distro/rpm/knot-resolver.spec
@@ -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