From 0b08a87dd21258d2c4d1ebd1029a0bd688d99ad0 Mon Sep 17 00:00:00 2001 From: Michael Howe Date: Sun, 16 Jul 2023 20:56:09 +0100 Subject: [PATCH] Stop installing (and diverting) check_running_kernel Upstream have fixed their version, and keeping this local version in sync is a waste of time (especially as it's broken with bookworm). --- debian/changelog | 7 +++++++ debian/nagios-plugins-local-client.install | 1 - debian/nagios-plugins-local-client.postinst | 17 +++++++++++++++++ debian/nagios-plugins-local-client.preinst | 6 +++--- 4 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 debian/nagios-plugins-local-client.postinst diff --git a/debian/changelog b/debian/changelog index 2138a33..36a71c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +nagios-plugins-local (0.26) unstable; urgency=medium + + * Remove check_running_kernel and associated overrides as the upstream + version was fixed back in 2019 + + -- Michael Howe Sun, 16 Jul 2023 20:53:51 +0100 + nagios-plugins-local (0.25) unstable; urgency=medium * Update remaining nagios plugins to python3, and also modernise them diff --git a/debian/nagios-plugins-local-client.install b/debian/nagios-plugins-local-client.install index 1163b01..f845d36 100644 --- a/debian/nagios-plugins-local-client.install +++ b/debian/nagios-plugins-local-client.install @@ -4,4 +4,3 @@ /usr/lib/nagios/plugins/check_monit /usr/lib/nagios/plugins/check_iostat /usr/lib/nagios/plugins/check_systemd -/usr/lib/nagios/plugins/check_running_kernel diff --git a/debian/nagios-plugins-local-client.postinst b/debian/nagios-plugins-local-client.postinst new file mode 100644 index 0000000..4853467 --- /dev/null +++ b/debian/nagios-plugins-local-client.postinst @@ -0,0 +1,17 @@ +#!/bin/sh + +set -e + +remove_diversion() { + dpkg-divert --package nagios-plugins-local-client --remove --rename /usr/lib/nagios/plugins/check_running_kernel +} + +if [ "configure" = "$1" ] && dpkg --compare-versions "$2" ge "0.25"; then + if dpkg-divert --list | grep -q -F "/usr/lib/nagios/plugins/check_running_kernel" ; then + remove_diversion + fi +fi + +#DEBHELPER# + +exit 0 diff --git a/debian/nagios-plugins-local-client.preinst b/debian/nagios-plugins-local-client.preinst index 68d8159..7e7173f 100644 --- a/debian/nagios-plugins-local-client.preinst +++ b/debian/nagios-plugins-local-client.preinst @@ -6,9 +6,9 @@ add_diversion() { dpkg-divert --add --package nagios-plugins-local-client --rename --divert /usr/lib/nagios/plugins/check_running_kernel.distrib /usr/lib/nagios/plugins/check_running_kernel } -if [ "upgrade" != "$1" ] || dpkg --compare-versions "$2" lt "0.20"; then - add_diversion -fi +#if [ "upgrade" != "$1" ] || dpkg --compare-versions "$2" lt "0.20"; then + # add_diversion +#fi #DEBHELPER# -- 2.39.5