From 7cd037d650a2fc3ea2cde96a2bdde3cf8619fc15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 21 Dec 2016 14:18:27 +0100 Subject: some work at testing --- debian/changelog | 14 +++++++++----- debian/postrm | 26 ++++++++++++++++++++++++++ debian/prerm | 26 -------------------------- debian/rules | 13 +++---------- 4 files changed, 38 insertions(+), 41 deletions(-) create mode 100755 debian/postrm delete mode 100755 debian/prerm diff --git a/debian/changelog b/debian/changelog index 010f38b..0560d55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,17 +1,21 @@ -ipmiutil (3.0.0-3) UNRELEASED; urgency=medium +ipmiutil (3.0.0-3) unstable; urgency=medium * Correct some systemd issues (Closes: #848861): - - debian/rules: Add dh_systemd_enable_overright to disable - ipmi_port at installation. - - New debian/patches/0710-systemd.patch to remove supported + - debian/rules: Add overright_dh_systemd_enable to install *.service files + and add option --no-enable to all services which need a ipmi driver. + - New debian/patches/0710-systemd.patch to remove not supported characters. (Thanks to Andreas Henriksson ) * Drop both dh-autoreconf/dh-systemd from both build-depends and dh --with arguments because this is all defaults when using dh compat 10. (Thanks to Andreas Henriksson ) + * Move purge action from prerm to postrm to clean /var/lib/ipmiutil + correctly. + * debian/rules: remove overright_dh_installinit to prevent + side effects with systemd. - -- Jörg Frings-Fürst Tue, 20 Dec 2016 11:55:42 +0100 + -- Jörg Frings-Fürst Wed, 21 Dec 2016 10:10:24 +0100 ipmiutil (3.0.0-2) unstable; urgency=medium diff --git a/debian/postrm b/debian/postrm new file mode 100755 index 0000000..dc8f214 --- /dev/null +++ b/debian/postrm @@ -0,0 +1,26 @@ +#!/bin/sh +# Debian prerm script +# +set -e + +case "$1" in + purge) + if [ -d /var/lib/ipmiutil/ ] + then + rm -Rf /var/lib/ipmiutil/* + fi + ;; + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/prerm b/debian/prerm deleted file mode 100755 index e66d2d9..0000000 --- a/debian/prerm +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# Debian prerm script -# -set -e - -case "$1" in - purge) - if [ -d /var/lib/ipmiutil/ ] - then - rm -Rf /var/lib/ipmiutil/ - fi - ;; - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff --git a/debian/rules b/debian/rules index 2fa6c72..a96f35a 100755 --- a/debian/rules +++ b/debian/rules @@ -26,16 +26,9 @@ override_dh_installman: dh_installman doc/iseltime.8 dh_installman -override_dh_installinit: - dh_installinit --name=ipmi_port - dh_installinit --name=ipmi_info - dh_installinit --name=ipmiutil_asy - dh_installinit --name=ipmiutil_evt - dh_installinit --name=ipmiutil_wdt - override_dh_systemd_enable: - dh_systemd_enable --no-enable ipmi_port.service + dh_systemd_enable --no-enable --name=ipmi_port dh_systemd_enable --name=ipmi_info - dh_systemd_enable --name=ipmiutil_asy - dh_systemd_enable --name=ipmiutil_evt + dh_systemd_enable --no-enable --name=ipmiutil_asy + dh_systemd_enable --no-enable --name=ipmiutil_evt dh_systemd_enable --name=ipmiutil_wdt -- cgit v1.2.3