[kernel] r16881 - dists/squeeze/linux-2.6/debian

[Ben Hutchings]

Author: benh
Date: Sun Feb 13 14:42:11 2011
New Revision: 16881

Log:
linux-base: Convert LILO entries for /boot/vmlinuz, /boot/vmlinuz.old (Closes: #613200)

Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/linux-base.postinst

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Sat Feb 12 16:57:55 2011	(r16880)
+++ dists/squeeze/linux-2.6/debian/changelog	Sun Feb 13 14:42:11 2011	(r16881)
@@ -12,6 +12,8 @@
   * bonding: Ensure that we unshare skbs prior to calling pskb_may_pull
     (Closes: #610838)
   * r8169: Keep firmware in memory (Closes: #609538)
+  * linux-base: Convert LILO entries for /boot/vmlinuz, /boot/vmlinuz.old
+    (Closes: #613200)
 
   [ dann frazier ]
   * xfs: fix information leak using stale NFS handle (CVE-2010-2943)

Modified: dists/squeeze/linux-2.6/debian/linux-base.postinst
==============================================================================
--- dists/squeeze/linux-2.6/debian/linux-base.postinst	Sat Feb 12 16:57:55 2011	(r16880)
+++ dists/squeeze/linux-2.6/debian/linux-base.postinst	Sun Feb 13 14:42:11 2011	(r16881)
@@ -461,7 +461,7 @@
 	    my ($name, $value) = ($tokens[$i][1], $tokens[$i + 2][1]);
 	    if (defined($name) && defined($value)) {
 		if ($name eq 'image') {
-		    $in_generic = ($value =~ m|^/vmlinuz(?:\.old)?$|);
+		    $in_generic = ($value =~ m|^(?:/boot)?/vmlinuz(?:\.old)?$|);
 		} elsif ($in_generic) {
 		    if ($name =~ /^(?:boot|root)$/) {
 			push @bdevs, $value;
@@ -494,7 +494,7 @@
 	    my $new_value;
 	    if (defined($name) && defined($value)) {
 		if ($name eq 'image') {
-		    $in_generic = ($value =~ m|^/vmlinuz(?:\.old)?$|);
+		    $in_generic = ($value =~ m|^(?:/boot)?/vmlinuz(?:\.old)?$|);
 		} elsif ($in_generic) {
 		    if ($name eq 'boot') {
 			# 'boot' is used directly by the lilo command, which