From d0c79cda3b08717544a5f33b948cd8bdfcd462f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 5 Jan 2015 14:50:23 +0100 Subject: Remove load of kernel modules via init scripts --- debian/changelog | 16 ++++++---------- debian/control | 30 +----------------------------- debian/copyright | 2 +- debian/ipmitool-ctrl.docs | 2 -- debian/ipmitool-ctrl.install | 1 - debian/ipmitool-ctrl.manpages | 1 - debian/ipmitool.install | 1 + debian/ipmitool.ipmievd.init | 3 ++- debian/ipmitool.manpages | 1 + debian/rules | 4 +++- debian/systemd/ipmitool.conf | 7 ------- 11 files changed, 15 insertions(+), 53 deletions(-) delete mode 100644 debian/ipmitool-ctrl.docs delete mode 100644 debian/ipmitool-ctrl.install delete mode 100644 debian/ipmitool-ctrl.manpages delete mode 100644 debian/systemd/ipmitool.conf diff --git a/debian/changelog b/debian/changelog index 6ac6778..1d6f9bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,19 +23,15 @@ ipmitool (1.8.15-1) unstable; urgency=medium - Add xz for searching upstream tarballs. * debian/copyright: - Add missing section for debian/*. - * New package ipmitool-ctrl: - - move program ipmitool from ipmitool to ipmitool-ctrl (Closes: #766418). * debian/ipmitool.postrm: - Escape the double quote around false. + * debian/rules: + - Add override_dh_systemd_enable to disable start after a fresh install. + * Remove load of kernel modules via init scripts (Closes: #766418): + - Remove debian/systemd/*.conf. + - Empty REQMODULES at ipmitool.ipmievd.init. - -- Jörg Frings-Fürst Mon, 01 Dec 2014 23:03:36 +0100 - -ipmitool (1.8.14-4~bpo70+1) wheezy-backports; urgency=medium - - * Rebuild for wheezy-backports (Closes: #757375). - - Add support for Dell 13G server. - - -- Jörg Frings-Fürst Wed, 10 Sep 2014 14:41:50 +0200 + -- Jörg Frings-Fürst Mon, 05 Jan 2015 14:42:49 +0100 ipmitool (1.8.14-4) unstable; urgency=medium diff --git a/debian/control b/debian/control index cc2db75..2f162c5 100644 --- a/debian/control +++ b/debian/control @@ -17,12 +17,11 @@ Homepage: http://sourceforge.net/projects/ipmitool/ Package: ipmitool Architecture: any -Depends: +Depends: ${misc:Depends}, ${shlibs:Depends}, lsb-base Recommends: openipmi -Suggests: ipmitool-ctrl Description: utility for IPMI control with kernel driver or LAN interface (daemon) A utility for managing and configuring devices that support the Intelligent Platform Management Interface. IPMI is an open standard @@ -40,30 +39,3 @@ Description: utility for IPMI control with kernel driver or LAN interface (daemo remote chassis power control. . This package contains the daemon. - -Package: ipmitool-ctrl -Architecture: any -Depends: - ${misc:Depends}, - ${shlibs:Depends}, - lsb-base -Recommends: openipmi -Replaces: ipmitool (<< 1.8.15-1) -Breaks: ipmitool (<< 1.8.15-1) -Description: utility for IPMI control with kernel driver or LAN interface - A utility for managing and configuring devices that support the - Intelligent Platform Management Interface. IPMI is an open standard - for monitoring, logging, recovery, inventory, and control of hardware - that is implemented independent of the main CPU, BIOS, and OS. The - service processor (or Baseboard Management Controller, BMC) is the - brain behind platform management and its primary purpose is to handle - the autonomous sensor monitoring and event logging features. - . - The ipmitool program provides a simple command-line interface to this - BMC. It features the ability to read the sensor data repository - (SDR) and print sensor values, display the contents of the System - Event Log (SEL), print Field Replaceable Unit (FRU) inventory - information, read and set LAN configuration parameters, and perform - remote chassis power control. - . - This package contains the control utility. diff --git a/debian/copyright b/debian/copyright index 6c263d6..5f2bde6 100644 --- a/debian/copyright +++ b/debian/copyright @@ -34,7 +34,7 @@ Copyright: 2003-2005 Duncan Laurie 2011-2013 Luk Claes 2012 Leo Iannacone 2013 Robie Basak - 2014 JörgFrings-Fürst + 2014-2015 JörgFrings-Fürst License: BSD-3-clause License: BSD-3-clause diff --git a/debian/ipmitool-ctrl.docs b/debian/ipmitool-ctrl.docs deleted file mode 100644 index 55bc0a6..0000000 --- a/debian/ipmitool-ctrl.docs +++ /dev/null @@ -1,2 +0,0 @@ -README -AUTHORS diff --git a/debian/ipmitool-ctrl.install b/debian/ipmitool-ctrl.install deleted file mode 100644 index 1df36c6..0000000 --- a/debian/ipmitool-ctrl.install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/* diff --git a/debian/ipmitool-ctrl.manpages b/debian/ipmitool-ctrl.manpages deleted file mode 100644 index 3a233b1..0000000 --- a/debian/ipmitool-ctrl.manpages +++ /dev/null @@ -1 +0,0 @@ -doc/ipmitool.1 diff --git a/debian/ipmitool.install b/debian/ipmitool.install index 78027ec..d3ea699 100644 --- a/debian/ipmitool.install +++ b/debian/ipmitool.install @@ -1 +1,2 @@ usr/sbin/ipmievd +usr/bin/* diff --git a/debian/ipmitool.ipmievd.init b/debian/ipmitool.ipmievd.init index 62d8d13..27e918f 100644 --- a/debian/ipmitool.ipmievd.init +++ b/debian/ipmitool.ipmievd.init @@ -48,7 +48,8 @@ IPMIEVD_OPTIONS="open daemon" # # requested kernelmodules # -REQMODULES="ipmi_devintf ipmi_msghandler ipmi_poweroff ipmi_si ipmi_watchdog" +#REQMODULES="ipmi_devintf ipmi_msghandler ipmi_poweroff ipmi_si ipmi_watchdog" +REQMODULES="" # Read config file if it is present. [ -f /etc/default/$NAME ] && . /etc/default/$NAME diff --git a/debian/ipmitool.manpages b/debian/ipmitool.manpages index e837070..ee0c5db 100644 --- a/debian/ipmitool.manpages +++ b/debian/ipmitool.manpages @@ -1 +1,2 @@ doc/ipmievd.8 +doc/ipmitool.1 diff --git a/debian/rules b/debian/rules index b2ed159..52a96a6 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all override_dh_auto_install: dh_auto_install - cp -f $(CURDIR)/debian/systemd/ipmitool.conf $(CURDIR)/debian/ipmitool/usr/lib/modules-load.d/ipmievd.conf # No need to have two copies of the license text/changelog in the package. $(RM) $(CURDIR)/debian/ipmitool/usr/share/doc/ipmitool/COPYING $(RM) $(CURDIR)/debian/ipmitool/usr/share/doc/ipmitool/ChangeLog @@ -23,5 +22,8 @@ override_dh_auto_install: override_dh_installinit: dh_installinit --name ipmievd --error-handler=ipmievd_initd_failed +override_dh_systemd_enable: + dh_systemd_enable --no-enable ipmievd.service + override_dh_auto_configure: dh_auto_configure -- --prefix=/usr --with-kerneldir --mandir=/usr/share/man diff --git a/debian/systemd/ipmitool.conf b/debian/systemd/ipmitool.conf deleted file mode 100644 index cdfba64..0000000 --- a/debian/systemd/ipmitool.conf +++ /dev/null @@ -1,7 +0,0 @@ -# systemd kernelmodules for ipmitools -# -ipmi_devintf -ipmi_msghandler -ipmi_poweroff -ipmi_si -ipmi_watchdog -- cgit v1.2.3