summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2011-12-17 20:07:37 +0000
committerThierry Vignaud <tv@mageia.org>2011-12-17 20:07:37 +0000
commit4b9f16cbf639e5a8a094bba8213a7c5a1c2d0595 (patch)
tree0cf27f39f920f200120a6eaae01e7171ddab6c5d
parentfd5e66c3bf52eb4b832d49b300fe3eb41dbebcc0 (diff)
downloaddrakx-4b9f16cbf639e5a8a094bba8213a7c5a1c2d0595.tar
drakx-4b9f16cbf639e5a8a094bba8213a7c5a1c2d0595.tar.gz
drakx-4b9f16cbf639e5a8a094bba8213a7c5a1c2d0595.tar.bz2
drakx-4b9f16cbf639e5a8a094bba8213a7c5a1c2d0595.tar.xz
drakx-4b9f16cbf639e5a8a094bba8213a7c5a1c2d0595.zip
(setupBootloader__entries) display partition labels when adding a foreign OS
(similar to previous commit, maybe should we share some helper for devices listing & GUI-formating)
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/any.pm3
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index b7a81080e..f00282d8a 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,6 +1,7 @@
- drakboot:
o display partition labels in list instead of just disk names in "boot
device" choice
+ o display partition labels when adding a foreign OS
- 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 b43c41272..085542204 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -539,7 +539,8 @@ sub setupBootloader__entries {
my %root_descr = map {
my $info = delete $hd_infos{$_->{rootDevice}};
my $dev = "/dev/$_->{device}";
- my $info_ = $info ? "$dev ($info)" : $dev;
+ my $hint = $info || $_->{info} || $_->{device_LABEL};
+ my $info_ = $hint ? "$dev ($hint)" : $dev;
($dev => $info_, fs::wild_device::from_part('', $_) => $info_);
} @$fstab;