Fix libata transition code for GRUB 1 config (Closes: #571662)
svn path=/dists/trunk/linux-2.6/; revision=15284
This commit is contained in:
parent
1db6535745
commit
b8f1fe6253
|
@ -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 <ben@decadent.org.uk> Fri, 26 Feb 2010 00:58:00 +0000
|
||||
|
||||
|
|
|
@ -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";
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue