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

[Ben Hutchings]

Author: benh
Date: Wed Mar  3 00:30:24 2010
New Revision: 15307

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

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	Wed Mar  3 00:16:57 2010	(r15306)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Mar  3 00:30:24 2010	(r15307)
@@ -2,6 +2,8 @@
 
   [ 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 at decadent.org.uk>  Sun, 28 Feb 2010 17:01:33 +0000
 

Modified: dists/trunk/linux-2.6/debian/linux-base.postinst
==============================================================================
--- dists/trunk/linux-2.6/debian/linux-base.postinst	Wed Mar  3 00:16:57 2010	(r15306)
+++ dists/trunk/linux-2.6/debian/linux-base.postinst	Wed Mar  3 00:30:24 2010	(r15307)
@@ -490,8 +490,7 @@
 		    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 @@
 	    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";
 		}