[kernel] r15284 - dists/trunk/linux-2.6/debian

[Ben Hutchings]

Author: benh
Date: Sat Feb 27 01:27:58 2010
New Revision: 15284

Log:
Fix libata transition code for GRUB 1 config (Closes: #571662)

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

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sat Feb 27 01:04:34 2010	(r15283)
+++ dists/trunk/linux-2.6/debian/changelog	Sat Feb 27 01:27:58 2010	(r15284)
@@ -2,6 +2,7 @@
 
   [ Ben Hutchings ]
   * Add missing debconf templates for linux-base (Closes: #571558)
+  * Fix libata transition code for GRUB 1 config (Closes: #571662)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Fri, 26 Feb 2010 00:58:00 +0000
 

Modified: dists/trunk/linux-2.6/debian/linux-base.postinst
==============================================================================
--- dists/trunk/linux-2.6/debian/linux-base.postinst	Sat Feb 27 01:04:34 2010	(r15283)
+++ dists/trunk/linux-2.6/debian/linux-base.postinst	Sat Feb 27 01:27:58 2010	(r15284)
@@ -305,11 +305,11 @@
     $old->seek(0, 0);
     for (grub1_parse($old)) {
 	my ($text, $name, $value) = @$_;
-	next unless defined($name);
-	if ($name eq 'kopt_2_6' ||
-	    ($name eq 'kopt' && !exists($options{kopt_2_6})) ||
-	    $name eq 'xenkopt') {
-	    if (defined(my $new_value = kernel_update($value))) {
+	if (defined($name) && 
+	    ($name eq 'kopt_2_6' ||
+	     ($name eq 'kopt' && !exists($options{kopt_2_6})) ||
+	     $name eq 'xenkopt')) {
+	    if (defined(my $new_value = kernel_update($value, $map))) {
 		$text = "## $name=$value\n# $name=$new_value\n";
 	    }
 	}