summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2011-12-17 20:07:34 +0000
committerThierry Vignaud <tv@mageia.org>2011-12-17 20:07:34 +0000
commitfd5e66c3bf52eb4b832d49b300fe3eb41dbebcc0 (patch)
treef99c3ff37e35b9a103f752b06ab943a5b52e76ca /perl-install
parent033b25820bd687376969758405b732fb3c81a9cb (diff)
downloaddrakx-fd5e66c3bf52eb4b832d49b300fe3eb41dbebcc0.tar
drakx-fd5e66c3bf52eb4b832d49b300fe3eb41dbebcc0.tar.gz
drakx-fd5e66c3bf52eb4b832d49b300fe3eb41dbebcc0.tar.bz2
drakx-fd5e66c3bf52eb4b832d49b300fe3eb41dbebcc0.tar.xz
drakx-fd5e66c3bf52eb4b832d49b300fe3eb41dbebcc0.zip
(setupBootloader__general) display partition labels in list instead of just disk names in "boot device" choice
hard disk names were displayed since 'as suggested in bug #21524, display the info on hard drives in the "boot device" choice' (pixel, 2006-03-09)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/any.pm3
2 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index a7c10c485..b7a81080e 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- drakboot:
+ o display partition labels in list instead of just disk names in "boot
+ device" choice
- harddrake: fix missing names (mga#3745)
Version 13.72.1 - 11 December 2011
diff --git a/perl-install/any.pm b/perl-install/any.pm
index e9c614ca8..b43c41272 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -423,7 +423,8 @@ sub setupBootloader__general {
foreach (bootloader::allowed_boot_parts($b, $all_hds)) {
my $dev = "/dev/$_->{device}";
push @boot_devices, $dev;
- $boot_devices{$dev} = $_->{info} ? "$dev ($_->{info})" : $dev;
+ my $name = $_->{info} || $_->{device_LABEL};
+ $boot_devices{$dev} = $name ? "$dev ($name)" : $dev;
}
$in->ask_from_({ #messages => N("Bootloader main options"),