summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2006-03-09 08:25:49 +0000
committerPascal Rigaux <pixel@mandriva.com>2006-03-09 08:25:49 +0000
commit90593f66eef885dc68fa4427c245ee1bc70fd1a1 (patch)
tree600c197b653795407f7a5d769597062017ae199b
parenta201ea28efd46b1415370ff55c6c77fea298e033 (diff)
downloaddrakx-90593f66eef885dc68fa4427c245ee1bc70fd1a1.tar
drakx-90593f66eef885dc68fa4427c245ee1bc70fd1a1.tar.gz
drakx-90593f66eef885dc68fa4427c245ee1bc70fd1a1.tar.bz2
drakx-90593f66eef885dc68fa4427c245ee1bc70fd1a1.tar.xz
drakx-90593f66eef885dc68fa4427c245ee1bc70fd1a1.zip
as suggested in bug #21524, display the info on hard drives in the "boot device" choice
-rw-r--r--perl-install/any.pm9
1 files changed, 8 insertions, 1 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 3057b03e0..271dfe845 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -277,6 +277,13 @@ sub setupBootloader__general {
$b->{password2} ||= $b->{password} ||= '';
$::Wizard_title = N("Boot Style Configuration");
if (arch() !~ /ppc/) {
+ my (@boot_devices, %boot_devices);
+ foreach (bootloader::allowed_boot_parts($b, $all_hds)) {
+ my $dev = "/dev/$_->{device}";
+ push @boot_devices, $dev;
+ $boot_devices{$dev} = $_->{info} ? "$dev ($_->{info})" : $dev;
+ }
+
$in->ask_from_({ messages => N("Bootloader main options"),
title => N("Bootloader main options"),
icon => 'banner-bootL',
@@ -293,7 +300,7 @@ sub setupBootloader__general {
}, [
{ label => N("Bootloader to use"), val => \$b->{method}, list => \@method_choices, format => \&bootloader::method2text },
if_(arch() !~ /ia64/,
- { label => N("Boot device"), val => \$b->{boot}, list => [ map { "/dev/$_->{device}" } bootloader::allowed_boot_parts($b, $all_hds) ], not_edit => !$::expert },
+ { label => N("Boot device"), val => \$b->{boot}, list => \@boot_devices, format => sub { $boot_devices{$_[0]} }, not_edit => !$::expert },
),
{ label => N("Delay before booting default image"), val => \$b->{timeout} },
{ text => N("Enable ACPI"), val => \$force_acpi, type => 'bool' },