debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

linux-base.postinst: Call id_to_path() not disk_id_to_path() 

svn path=/dists/trunk/linux-2.6/; revision=15307
This commit is contained in:
Ben Hutchings 2010-03-03 00:30:24 +00:00
parent a3420c5141
commit fb3123e6dd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -2,6 +2,8 @@ linux-2.6 (2.6.33-1~experimental.3) UNRELEASED; urgency=low
[ Ben Hutchings ]
* Fix regexp for binNMU versions in modules/rules.include (Closes: #524632)
* Fix calls to disk_id_to_path (renamed to id_to_path) in linux-base
(Closes: #572283)
-- Ben Hutchings <ben@decadent.org.uk> Sun, 28 Feb 2010 17:01:33 +0000

6
debian/linux-base.postinst vendored
View File

@ -490,8 +490,7 @@ sub lilo_update {
if ($name eq 'boot') {
# 'boot' is used directly by the lilo command, which
# doesn't use libblkid
$new_value =
$map->{$value} && disk_id_to_path($map->{$value});
$new_value = $map->{$value} && id_to_path($map->{$value});
} elsif ($name eq 'root') {
# 'root' adds a root parameter to the kernel command
# line
@ -724,8 +723,7 @@ sub delo_update {
if ($name eq 'label') {
++$i; # next entry
} elsif ($name eq 'boot' && $i < 0) {
my $new_value =
$map->{$value} && disk_id_to_path($map->{$value});
my $new_value = $map->{$value} && id_to_path($map->{$value});
if (defined($new_value)) {
$text = "# $text" . "boot=$new_value\n";
}