blacklist ipmi_watchdog.ko

diff --git a/Makefile b/Makefile
index 8dd01eb8edd34653ac98040b08297c287bfaa366..9a4bdae286b03b0a1bf6c1f927a380c8aa493cf1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=4.1
 
 # also update proxmox-ve/changelog if you change KERNEL_VER or KREL
 KERNEL_VER=4.2.6
-PKGREL=24
+PKGREL=25
 # also include firmware of previous version into
 # the fw package:  fwlist-2.6.32-PREV-pve
 KREL=1
@@ -165,7 +165,9 @@ data: .compile_mark ixgbe.ko e1000e.ko ${SPL_MODULES} ${ZFS_MODULES} ${DRBD_MODU
        depmod -b tmp/ ${KVNAME}
        # Autogenerate blacklist for watchdog devices (see README)
        install -m 0755 -d tmp/lib/modprobe.d
-       ls tmp/lib/modules/${KVNAME}/kernel/drivers/watchdog/|sed -e 's/^/blacklist /' -e 's/.ko$$//'|sort -u > tmp/lib/modprobe.d/blacklist_${PACKAGE}.conf
+       ls tmp/lib/modules/${KVNAME}/kernel/drivers/watchdog/ > watchdog-blacklist.tmp
+       echo ipmi_watchdog.ko >> watchdog-blacklist.tmp
+       cat watchdog-blacklist.tmp|sed -e 's/^/blacklist /' -e 's/.ko$$//'|sort -u > tmp/lib/modprobe.d/blacklist_${PACKAGE}.conf
        mv tmp data
 
 PVE_CONFIG_OPTS= \
@@ -416,7 +418,7 @@ distclean: clean
 
 .PHONY: clean
 clean:
-       rm -rf *~ .compile_mark ${KERNEL_CFG_ORG} ${KERNEL_SRC} ${KERNEL_SRC}.tmp ${KERNEL_CFG_ORG} ${KERNEL_SRC}.org orig tmp data proxmox-ve/data *.deb ${headers_tmp} fwdata fwlist.tmp *.ko fwlist-${KVNAME} ${ZFSDIR} ${SPLDIR} ${SPL_MODULES} ${ZFS_MODULES} hpsa.ko ${HPSADIR} ${DRBDDIR} drbd-9.0 ${IGBDIR} igb.ko ${IXGBEDIR} ixgbe.ko ${E1000EDIR} e1000e.ko
+       rm -rf *~ .compile_mark watchdog-blacklist.tmp ${KERNEL_CFG_ORG} ${KERNEL_SRC} ${KERNEL_SRC}.tmp ${KERNEL_CFG_ORG} ${KERNEL_SRC}.org orig tmp data proxmox-ve/data *.deb ${headers_tmp} fwdata fwlist.tmp *.ko fwlist-${KVNAME} ${ZFSDIR} ${SPLDIR} ${SPL_MODULES} ${ZFS_MODULES} hpsa.ko ${HPSADIR} ${DRBDDIR} drbd-9.0 ${IGBDIR} igb.ko ${IXGBEDIR} ixgbe.ko ${E1000EDIR} e1000e.ko
 
 
 

diff --git a/changelog.Debian b/changelog.Debian
index fba04059ebb21689abb80960396628620f5402d4..9023a53b486bb6dbb0c23adbc0f67cfe3892b42f 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+pve-kernel (4.2.3-25) unstable; urgency=medium
+
+  * blacklist ipmi_watchdog.ko
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 04 Dec 2015 19:04:52 +0100
+
 pve-kernel (4.2.3-24) unstable; urgency=medium
 
   * include autogenerated blacklist for watchdog devices