From 1d941a327bfc861301b18d125e051cfb4f0206ad Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 17 Jan 2008 09:59:11 +0000
Subject: - drakboot:   o fix handling root=UUID=xxx when modifying a
 bootloader entry (#36788)

---
 perl-install/NEWS   | 3 +++
 perl-install/any.pm | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 6093adf88..4440fcaa9 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- drakboot:
+  o fix handling root=UUID=xxx when modifying a bootloader entry (#36788)
+
 Version 10.6.4 - 14 January 2008
 
 - localedrake, drakx-finish-install:
diff --git a/perl-install/any.pm b/perl-install/any.pm
index b0da2a94a..42949221b 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -483,14 +483,15 @@ sub setupBootloader__entries {
 	my %root_descr = map { 
 	    my $info = delete $hd_infos{$_->{rootDevice}};
 	    my $dev = "/dev/$_->{device}";
-	    $dev => $info ? "$dev ($info)" : $dev;
+	    my $info_ = $info ? "$dev ($info)" : $dev;
+	    ($dev => $info_, fs::wild_device::from_part('', $_) => $info_);
 	} @$fstab;
 
 	my @l;
 	if ($e->{type} eq "image") { 
 	    @l = (
 { label => N("Image"), val => \$e->{kernel_or_dev}, list => [ map { "/boot/$_" } bootloader::installed_vmlinuz() ], not_edit => 0 },
-{ label => N("Root"), val => \$e->{root}, list => [ map { "/dev/$_->{device}" } @$fstab ], format => sub { $root_descr{$_[0]} }  },
+{ label => N("Root"), val => \$e->{root}, list => [ map { fs::wild_device::from_part('', $_) } @$fstab ], format => sub { $root_descr{$_[0]} }  },
 { label => N("Append"), val => \$append },
   if_($e->{xen}, 
 { label => N("Xen append"), val => \$e->{xen_append} }
-- 
cgit v1.2.1