rpmnew file after updating package
Message-ID: <52af2c32.ZmHNWuY4kvauVcfD%lm(a)mathias-kettner.de>
User-Agent: Heirloom mailx 12.4 7/29/08
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Module: check_mk
Branch: master
Commit: 5ce56b00c3e73fb0a04f516c49402b23ec542a20
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ce56b00c3e73f…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Dec 16 17:36:25 2013 +0100
FIX RPMs: Cleaning up xinetd checkmk.rpmnew file after updating package
These files should not be left there after an RPM update, because they could
be loaded by xinetd. Removing these files now in %post section of RPM package.
---
.werks/365 | 11 +++++++++++
ChangeLog | 1 +
check_mk.spec | 3 +++
3 files changed, 15 insertions(+)
diff --git a/.werks/365 b/.werks/365
new file mode 100644
index 0000000..c6f6465
--- /dev/null
+++ b/.werks/365
@@ -0,0 +1,11 @@
+Title: RPMs: Cleaning up xinetd checkmk.rpmnew file after updating package
+Level: 1
+Component: checks
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1387211537
+Targetversion: future
+
+These files should not be left there after an RPM update, because they could
+be loaded by xinetd. Removing these files now in %post section of RPM package.
diff --git a/ChangeLog b/ChangeLog
index d121a2a..faf56cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,7 @@
* 0340 FIX: blade_health: fix check, it was totally broken...
* 0363 FIX: mysql_capacity: Did use wrong calculated warn / crit thresholds...
* 0364 FIX: brocade_mlx*: Several cleanups, fixed bug in brocade_mlx_fan where only
the first worst state was shown in output
+ * 0365 FIX: RPMs: Cleaning up xinetd checkmk.rpmnew file after updating package...
Multisite:
* 0302 FIX: Fixed highlight of choosen elements in foldertee/views snapin in
Chrome/IE
diff --git a/check_mk.spec b/check_mk.spec
index dc88a9f..72f6f4b 100644
--- a/check_mk.spec
+++ b/check_mk.spec
@@ -245,6 +245,7 @@ fi
%define reload_xinetd if [ -x /etc/init.d/xinetd ] ; then if pgrep -x xinetd
>/dev/null ; then echo "Reloading xinetd..." ; /etc/init.d/xinetd reload ;
else echo "Starting xinetd..." ; /etc/init.d/xinetd start ; fi ; fi
%define activate_xinetd if which chkconfig >/dev/null 2>&1 ; then echo
"Activating startscript of xinetd" ; chkconfig xinetd on ; fi
+%define cleanup_rpmnew if [ -f /etc/xinetd.d/check_mk.rpmnew ] ; then rm
/etc/xinetd.d/check_mk.rpmnew ; fi
%pre agent
if [ ! -x /etc/init.d/xinetd ] ; then
@@ -264,6 +265,7 @@ if [ ! -x /etc/init.d/xinetd ] ; then
fi
%post agent
+%cleanup_rpmnew
%activate_xinetd
%reload_xinetd
@@ -291,6 +293,7 @@ if [ ! -x /etc/init.d/xinetd ] ; then
fi
%post caching-agent
+%cleanup_rpmnew
%activate_xinetd
%reload_xinetd