diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-01-17 09:59:11 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-01-17 09:59:11 +0000 |
| commit | 1d941a327bfc861301b18d125e051cfb4f0206ad (patch) | |
| tree | 649ffec24a7cee069eea5568e364cb27d0d5553a | |
| parent | b02d28cb421504ddfa68dd9b98cc2373d5b05f11 (diff) | |
| download | drakx-1d941a327bfc861301b18d125e051cfb4f0206ad.tar drakx-1d941a327bfc861301b18d125e051cfb4f0206ad.tar.gz drakx-1d941a327bfc861301b18d125e051cfb4f0206ad.tar.bz2 drakx-1d941a327bfc861301b18d125e051cfb4f0206ad.tar.xz drakx-1d941a327bfc861301b18d125e051cfb4f0206ad.zip | |
- drakboot:
o fix handling root=UUID=xxx when modifying a bootloader entry (#36788)
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | 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} } |