From b8f1fe6253914ee7cb93dd18fe5ae3405817f85e Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 27 Feb 2010 01:27:58 +0000 Subject: [PATCH] Fix libata transition code for GRUB 1 config (Closes: #571662) svn path=/dists/trunk/linux-2.6/; revision=15284 --- debian/changelog | 1 + debian/linux-base.postinst | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index d7b426123..a5689ae85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ linux-2.6 (2.6.33-1~experimental.2) UNRELEASED; urgency=low [ Ben Hutchings ] * Add missing debconf templates for linux-base (Closes: #571558) + * Fix libata transition code for GRUB 1 config (Closes: #571662) -- Ben Hutchings Fri, 26 Feb 2010 00:58:00 +0000 diff --git a/debian/linux-base.postinst b/debian/linux-base.postinst index e78101fcb..c3e0841ea 100644 --- a/debian/linux-base.postinst +++ b/debian/linux-base.postinst @@ -305,11 +305,11 @@ sub grub1_update { $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"; } }