[kernel] r15896 - dists/lenny/linux-2.6/debian

[Ben Hutchings]

Author: benh
Date: Sat Jun 19 23:30:29 2010
New Revision: 15896

Log:
[x86, hppa, ia64] Restore automatic update of LILO, PALO and ELILO (Closes: #505609)

Modified:
   dists/lenny/linux-2.6/debian/changelog
   dists/lenny/linux-2.6/debian/rules.real

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	Sat Jun 19 19:12:56 2010	(r15895)
+++ dists/lenny/linux-2.6/debian/changelog	Sat Jun 19 23:30:29 2010	(r15896)
@@ -4,6 +4,8 @@
   * usbhid: Reduce the race condition between disconnect and ioctl
     (Closes: #511892)
   * r8169: Fix MDIO timing (Closes: #583139)
+  * [x86, hppa, ia64] Restore automatic update of LILO, PALO and ELILO on
+    kernel installation, upgrade or removal (Closes: #505609)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 15 Jun 2010 02:41:50 +0100
 

Modified: dists/lenny/linux-2.6/debian/rules.real
==============================================================================
--- dists/lenny/linux-2.6/debian/rules.real	Sat Jun 19 19:12:56 2010	(r15895)
+++ dists/lenny/linux-2.6/debian/rules.real	Sat Jun 19 23:30:29 2010	(r15896)
@@ -431,6 +431,12 @@
 
 install-image_powerpc_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_KIMAGE = vmlinux
 
+ifneq ($(FEATURESET),xen)
+install-image_amd64_$(FEATURESET)_$(FLAVOUR)_plain_templates \
+install-image_i386_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_BOOTLOADER = lilo
+endif
+install-image_hppa_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_BOOTLOADER = palo
+install-image_ia64_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_BOOTLOADER = elilo
 install-image_s390_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_BOOTLOADER = zipl
 
 install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_templates: